@pisell/pisellos 2.0.34 → 2.0.35

package/dist/modules/Cart/types.d.ts

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

package/dist/modules/Cart/utils/cartProduct.js

@@ -61,6 +61,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       options: options,
       num: num
     });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
       bundle: bundle,
@@ -161,7 +162,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
     options = params.options;
-  var num = params.num || 1;
+  // const num = params.num || 1;
   var price = Number(product.price);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
     price = bundle.reduce(function (accumulator, currentValue) {
@@ -175,7 +176,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 
 /**

package/dist/modules/Summary/utils.js

@@ -28,7 +28,7 @@ export var calculateSubtotal = function calculateSubtotal(items) {
     return '0.00';
   }
   var subtotal = items.reduce(function (sum, item) {
-    var cartItemTotalPrice = new Decimal(item.total || 0);
+    var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new Decimal(0));
   return subtotal.toFixed(2);
@@ -50,7 +50,7 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
     is_price_include_tax = _ref.is_price_include_tax,
     tax_rate = _ref.tax_rate;
   var totalTaxFee = items.reduce(function (sum, item) {
-    var cartItemTotalPrice = new Decimal(item.total || 0);
+    var cartItemTotalPrice = new Decimal(item.summaryTotal || 0);
     var taxRate = new Decimal(tax_rate || 0).div(100);
     var productTaxRate = cartItemTotalPrice.times(taxRate).times((item === null || item === void 0 ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

package/dist/solution/BookingByStep/index.js

@@ -272,8 +272,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductByScheduleDate",
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var _product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, _schedule$product_ids, schedule, otherProductsIds, allProductIds;
+        var _schedule$product_ids;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -296,29 +296,34 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               //   .filter((n) => n !== null && n !== undefined);
 
               // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
-              if (!((_product_ids = product_ids) !== null && _product_ids !== void 0 && _product_ids.length)) {
-                schedule = scheduleList.find(function (n) {
-                  return n.date === date;
-                });
-                if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
-                  product_ids = schedule.product_ids;
-                }
+              // if (!product_ids?.length) {
+              //   const schedule = scheduleList.find((n) => n.date === date);
+              //   if (schedule && schedule.product_ids?.length) {
+              //     product_ids = schedule.product_ids;
+              //   }
+              // }
+              // V2接口修改后，只能从schedule 接口里拿数据，不可以从外面拿，外面给的是装修数据
+              schedule = scheduleList.find(function (n) {
+                return n.date === date;
+              });
+              if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
+                product_ids = schedule.product_ids;
               }
               // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
               otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
               allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
                 return self.indexOf(n) === index;
               });
-              _context3.next = 8;
+              _context3.next = 9;
               return this.loadProducts({
                 // schedule_ids: scheduleIds,
                 product_ids: allProductIds,
                 category_ids: category_ids
                 // schedule_date: date,
               });
-            case 8:
-              return _context3.abrupt("return", _context3.sent);
             case 9:
+              return _context3.abrupt("return", _context3.sent);
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -341,7 +346,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
               cartItems = this.store.cart.getItems();
               if (!cartItems.length) {
-                _context5.next = 24;
+                _context5.next = 25;
                 break;
               }
               userPlugin = this.core.getPlugin('user');
@@ -433,6 +438,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator.f();
               return _context5.finish(21);
             case 24:
+              this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateQuotationPrice"), {});
+            case 25:
             case "end":
               return _context5.stop();
           }
@@ -2460,8 +2467,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // m.times 需要做个过滤，假设 timeSlice.start_at 是 09:30 timeSlice.end_at 是 11:30
           // time 是 time.start_at = 2025-05-26 10:30, time.end_at = 2025-05-26 12:30
           // 需要判断 time 的开始结束时间 是否包含timeSlice的开始结束时间
+
+          // n.start_at 是 2025-06-30 15:00 end_at 2025-06-30 17:00
+          // item.start 是 2025-06-30 16:00 item.end 是 2025-06-30 19:00
+          // 需要判断 n.start_at 和 n.end_at 是否在 item.start 和 item.end 之间
+          // 如果 n.start_at 和 n.end_at 在 item.start 和 item.end 有交集，则此时间需要计算
           var mTimes = m.times.filter(function (n) {
-            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute');
+            return !dayjs(n.start_at).isAfter(dayjs(item.start), 'minute') && !dayjs(n.end_at).isBefore(dayjs(item.end), 'minute') || dayjs(n.start_at).isBefore(dayjs(item.end), 'minute') && dayjs(n.end_at).isAfter(dayjs(item.start), 'minute');
           });
           // 如果在这个区间的时间一个都没有，可以直接认为这个资源不可用
           if (mTimes.length === 0) {
@@ -2889,6 +2901,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         var params,
           startDate,
           endDate,
+          endDateAfterMonth,
           tempProducts,
           schedule,
           filteredSchedule,
@@ -2913,13 +2926,20 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 startDate = dayjs().format('YYYY-MM-DD');
               }
               // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
-              endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              // 优化策略：
+              // 在 endDate 添加完一个月以后，如果 endDate 还小于 startDate + 7 天，则还需要 endDate+7 天
+              endDateAfterMonth = dayjs().add(1, 'month').format('YYYY-MM-DD');
+              if (dayjs(startDate).add(7, 'day').isAfter(dayjs(endDateAfterMonth), 'day')) {
+                endDate = dayjs(startDate).add(7, 'day').format('YYYY-MM-DD');
+              } else {
+                endDate = endDateAfterMonth;
+              }
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
               tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
               schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 10;
+              _context32.next = 11;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -2927,17 +2947,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: tempResourceIds
                 }
               });
-            case 10:
+            case 11:
               res = _context32.sent;
               // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
               // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
               cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
               if (!cache) {
-                _context32.next = 16;
+                _context32.next = 17;
                 break;
               }
               if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 16;
+                _context32.next = 17;
                 break;
               }
               this.store.date.setDateList(cache.dateList);
@@ -2945,7 +2965,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: cache.dateList,
                 firstAvailableDate: cache.firstAvailableDate
               });
-            case 16:
+            case 17:
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -3072,22 +3092,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 24:
+            case 25:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 30;
+                _context32.next = 31;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 26);
-            case 26:
+              return _context32.delegateYield(_loop3(), "t0", 27);
+            case 27:
               if (!_context32.t0) {
-                _context32.next = 28;
+                _context32.next = 29;
                 break;
               }
-              return _context32.abrupt("break", 30);
-            case 28:
-              _context32.next = 24;
+              return _context32.abrupt("break", 31);
+            case 29:
+              _context32.next = 25;
               break;
-            case 30:
+            case 31:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3097,13 +3117,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate,
                 startDate: startDate,
-                endDate: endDate
+                endDate: dayjs(currentDate).format('YYYY-MM-DD')
               });
               return _context32.abrupt("return", {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 34:
+            case 35:
             case "end":
               return _context32.stop();
           }

package/lib/modules/Cart/types.d.ts

@@ -69,8 +69,10 @@ export interface CartItem {
     name?: string;
     /** 商品价格 */
     price?: number | string;
-    /** 商品总价 */
+    /** 单个商品包括商品本身价格+套餐价格+规格等价格得出来的 */
     total?: number | string;
+    /** 基于 total 乘以 商品数量的价格 */
+    summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
     /** 商品数量 */

package/lib/modules/Cart/utils/cartProduct.js

@@ -74,6 +74,7 @@ var formatProductToCartItem = (params) => {
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
     cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
       bundle,
@@ -163,7 +164,6 @@ var formatProductToCartItemOrigin = (params) => {
 };
 var getProductTotalPrice = (params) => {
   const { product, bundle, options } = params;
-  const num = params.num || 1;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -175,7 +175,7 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price * num;
+  return price;
 };
 var getProductOriginTotalPrice = (params) => {
   const { product, bundle, options } = params;

package/lib/modules/Summary/utils.js

@@ -55,7 +55,7 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     return sum.plus(cartItemTotalPrice);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
@@ -66,7 +66,7 @@ var calculateTaxFee = (shopInfo, items) => {
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   const totalTaxFee = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.total || 0);
+    const cartItemTotalPrice = new import_decimal.default(item.summaryTotal || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
     const productTaxRate = cartItemTotalPrice.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

package/lib/solution/BookingByStep/index.js

@@ -216,11 +216,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
-    if (!(product_ids == null ? void 0 : product_ids.length)) {
-      const schedule = scheduleList.find((n) => n.date === date);
-      if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
-        product_ids = schedule.product_ids;
-      }
+    const schedule = scheduleList.find((n) => n.date === date);
+    if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
+      product_ids = schedule.product_ids;
     }
     const otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
     const allProductIds = [...product_ids, ...otherProductsIds].filter(
@@ -283,6 +281,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           bundle
         });
       }
+      this.core.effects.emit(`${this.store.cart.name}:onUpdateQuotationPrice`, {});
     }
   }
   // 加载当前店铺下所有 schedule
@@ -1703,7 +1702,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         let currentResourcesCount = 0;
         const currentResourcesTimeSlotCanUsedArr = [];
         const mTimes = m.times.filter((n) => {
-          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute");
+          return !(0, import_dayjs.default)(n.start_at).isAfter((0, import_dayjs.default)(item.start), "minute") && !(0, import_dayjs.default)(n.end_at).isBefore((0, import_dayjs.default)(item.end), "minute") || (0, import_dayjs.default)(n.start_at).isBefore((0, import_dayjs.default)(item.end), "minute") && (0, import_dayjs.default)(n.end_at).isAfter((0, import_dayjs.default)(item.start), "minute");
         });
         if (mTimes.length === 0) {
           return;
@@ -2037,7 +2036,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
-    endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    const endDateAfterMonth = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    if ((0, import_dayjs.default)(startDate).add(7, "day").isAfter((0, import_dayjs.default)(endDateAfterMonth), "day")) {
+      endDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
+    } else {
+      endDate = endDateAfterMonth;
+    }
     let tempProducts;
     tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
     const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];
@@ -2170,7 +2174,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       dateList: dates,
       firstAvailableDate,
       startDate,
-      endDate
+      endDate: (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD")
     });
     return {
       dateList: dates,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",
     "prepublishOnly": "npm run build",
-    "deploy": "yarn run build && yarn run changeset && yarn run version && npm run release"
+    "deploy": "npm run build && npm run changeset && npm run version && npm run release"
   },
   "repository": {
     "type": "git",
@@ -67,4 +67,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}