@pisell/pisellos 2.1.94 → 2.1.96

package/dist/modules/Rules/index.d.ts

@@ -27,6 +27,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
         unavailableReason?: UnavailableReason;
     };
+    filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, }: {
         discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -201,6 +201,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         unavailableReason: unavailableReason
       };
     }
+  }, {
+    key: "filterDiscountListByType",
+    value: function filterDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type === type || item.tag === type;
+      });
+    }
 
     // 获取券不可用的原因
   }, {
@@ -1048,25 +1055,34 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 price: product.price
               }), {}, {
-                discount_list: []
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
+              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$main_product, _product$main_product2;
+              var total = product.inPromotion ? (_ref8 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref8 !== void 0 ? _ref8 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              if ((product.discount_list || []).some(function (item) {
+                return item.type === 'promotion';
+              })) {
+                var _product$total;
+                total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
+              }
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
-                main_product_selling_price: product.price
+                main_product_selling_price: (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : product.price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
-                total: product.origin_total || product.total,
+                total: total,
                 price: product.price,
-                main_product_selling_price: product.price
+                main_product_selling_price: (_product$main_product2 = product.main_product_selling_price) !== null && _product$main_product2 !== void 0 ? _product$main_product2 : product.price
               }), {}, {
-                discount_list: []
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
+            var _flatItem$bundleItem8;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: [],
+              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1093,13 +1109,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 主商品：保持原有逻辑
           if (splitCount < totalQuantity && isNeedSplit) {
             arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: [],
+              discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0]
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis10, _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1111,7 +1127,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
+            if (_this3.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1163,19 +1179,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
-            var total = targetProductTotal;
+            var _total = targetProductTotal;
             if (product.options) {
-              total = product.options.reduce(function (accumulator, currentValue) {
+              _total = product.options.reduce(function (accumulator, currentValue) {
                 var currentPrice = new Decimal(currentValue.price || 0);
                 var currentNum = new Decimal(currentValue.num || 0);
                 return accumulator.add(currentPrice.mul(currentNum));
-              }, new Decimal(total)).toNumber();
+              }, new Decimal(_total)).toNumber();
             }
 
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
-              debugger;
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
@@ -1189,15 +1204,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new Decimal(product.price || 0).toNumber(),
-                total: total
+                total: _total
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
-                discount_list: [discountDetail],
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
                 _id: product._id.split('___')[0] + "___" + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: total,
+                total: _total,
                 origin_total: productOriginTotal,
                 main_product_selling_price: targetProductTotal
               }));
@@ -1252,7 +1267,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: 0,
                 // 商品券价格为0
                 total: 0,
-                discount_list: [_discountDetail],
+                discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail]),
                 processed: true,
                 _discountId: _selectedDiscount2.id
               }));
@@ -1265,7 +1280,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: "".concat(flatItem._id, "_split_rest"),
                 num: normalNum,
                 quantity: normalNum,
-                discount_list: [],
+                discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion'),
                 processed: true
               }));
             }
@@ -1293,7 +1308,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
             }
-            debugger;
+
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
@@ -1327,7 +1342,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: _targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-              discount_list: [_discountDetail2],
+              discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
               processed: true
             }));
           }
@@ -1348,7 +1363,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var getDefaultProduct = function getDefaultProduct() {
               if (product.isClient) {
                 return _this3.hooks.setProduct(originProduct, {
-                  discount_list: [],
+                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
                   price: product.price,
                   origin_total: getProductOriginTotalPrice({
                     product: {
@@ -1369,7 +1384,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 });
               } else {
                 return _this3.hooks.setProduct(originProduct, {
-                  discount_list: [],
+                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
                   total: product.total,
                   origin_total: product.origin_total,
                   price: product.price
@@ -1829,10 +1844,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem8, _flatItem$bundleItem9;
+          var _flatItem$bundleItem9, _flatItem$bundleItem10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.price_type;
-          var priceTypeExt = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type_ext;
+          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
+          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -1870,10 +1885,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11;
+          var _flatItem$bundleItem11, _flatItem$bundleItem12;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
+          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

package/dist/modules/Schedule/index.js

@@ -205,7 +205,7 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      return this.store.scheduleList.filter(function (n) {
+      return (this.store.scheduleList || []).filter(function (n) {
         return ids.includes(n.id);
       });
     }

package/dist/modules/Summary/index.js

@@ -120,7 +120,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {};
               scheduleModule = this.core.getModule('appointmentBooking_schedule');
-              needScheduleIds = this.store.surchargeList.map(function (item) {
+              needScheduleIds = (this.store.surchargeList || []).map(function (item) {
                 return item.available_schedule_ids;
               }).flat();
               scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
@@ -210,7 +210,7 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
     value: function getSurchargeforUtils(items) {
       // const surchargeList = this.store.surchargeList;
       var scheduleModule = this.core.getModule('appointmentBooking_schedule');
-      var needScheduleIds = this.store.surchargeList.map(function (item) {
+      var needScheduleIds = (this.store.surchargeList || []).map(function (item) {
         return item.available_schedule_ids;
       }).flat();
       var scheduleList = scheduleModule === null || scheduleModule === void 0 ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);

package/dist/solution/BookingByStep/index.d.ts

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/modules/Rules/index.d.ts

@@ -27,6 +27,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
         unavailableReason?: UnavailableReason;
     };
+    filterDiscountListByType(discountList: Discount[], type: string): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, }: {
         discountList: Discount[];

package/lib/modules/Rules/index.js

@@ -144,6 +144,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       unavailableReason
     };
   }
+  filterDiscountListByType(discountList, type) {
+    return (discountList || []).filter((item) => item.type === type || item.tag === type);
+  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -567,7 +570,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -730,30 +733,34 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   }),
                   price: product.price
                 },
-                discount_list: []
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })]
             );
           } else {
+            let total = product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
+            if ((product.discount_list || []).some((item) => item.type === "promotion")) {
+              total = product.total ?? product.origin_total;
+            }
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
                   price: product.price,
-                  main_product_selling_price: product.price
+                  main_product_selling_price: product.main_product_selling_price ?? product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
-                  total: product.origin_total || product.total,
+                  total,
                   price: product.price,
-                  main_product_selling_price: product.price
+                  main_product_selling_price: product.main_product_selling_price ?? product.price
                 },
-                discount_list: []
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })]
             );
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: [],
+            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -771,7 +778,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
           arr.push(this.hooks.setProduct(originProduct, {
-            discount_list: [],
+            discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
             quantity: totalQuantity - splitCount,
             _id: product._id.split("___")[0]
           }));
@@ -781,10 +788,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           usedDiscounts.set(selectedDiscount2.id, true);
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           let productOriginTotal = product.origin_total || product.total || 0;
-          if (((_u = product.discount_list) == null ? void 0 : _u.length) && product.origin_total) {
+          if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_v = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _v.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_w = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _w.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
@@ -807,9 +814,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
+              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
               fixed_amount: amount,
-              discount_calculation_mode: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_calculation_mode,
+              discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -836,7 +843,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }, new import_decimal.default(total)).toNumber();
           }
           if (product.isClient) {
-            debugger;
             arr.push(this.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
               price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
@@ -854,7 +860,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }));
           } else {
             arr.push(this.hooks.setProduct(originProduct, {
-              discount_list: [discountDetail],
+              discount_list: this.filterDiscountListByType(product.discount_list, "promotion").concat([discountDetail]),
               _id: product._id.split("___")[0] + "___" + selectedDiscount2.id + index,
               price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
@@ -879,7 +885,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
+                discount_calculation_mode: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -905,7 +911,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               price: 0,
               // 商品券价格为0
               total: 0,
-              discount_list: [discountDetail],
+              discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion").concat([discountDetail]),
               processed: true,
               _discountId: selectedDiscount2.id
             });
@@ -917,7 +923,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               _id: `${flatItem._id}_split_rest`,
               num: normalNum,
               quantity: normalNum,
-              discount_list: [],
+              discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion"),
               processed: true
             });
           }
@@ -943,15 +949,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           }
-          debugger;
           const uniqueId = flatItem._id;
           const discountDetail = {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_card_type,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_calculation_mode,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -966,7 +971,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
-            _num: (product.num || 1) * (((_B = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _B.num) || 1)
+            _num: (product.num || 1) * (((_C = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _C.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -975,7 +980,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             ...flatItem,
             total: targetProductTotal,
             price: new import_decimal.default(productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-            discount_list: [discountDetail],
+            discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion").concat([discountDetail]),
             processed: true
           });
         }
@@ -991,7 +996,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const getDefaultProduct = () => {
             if (product.isClient) {
               return this.hooks.setProduct(originProduct, {
-                discount_list: [],
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 price: product.price,
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
@@ -1012,7 +1017,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               });
             } else {
               return this.hooks.setProduct(originProduct, {
-                discount_list: [],
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 total: product.total,
                 origin_total: product.origin_total,
                 price: product.price

package/lib/modules/Schedule/index.js

@@ -135,7 +135,7 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     return dates;
   }
   getScheduleListByIds(ids) {
-    return this.store.scheduleList.filter((n) => ids.includes(n.id));
+    return (this.store.scheduleList || []).filter((n) => ids.includes(n.id));
   }
   setAvailabilityScheduleDateList(list) {
     this.store.availabilityDateList = list;

package/lib/modules/Summary/index.js

@@ -77,7 +77,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
     const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (this.store.surchargeList || []).map((item) => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
@@ -120,7 +120,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
   }
   getSurchargeforUtils(items) {
     const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
+    const needScheduleIds = (this.store.surchargeList || []).map((item) => item.available_schedule_ids).flat();
     const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

package/lib/solution/BookingByStep/index.d.ts

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.94",
+  "version": "2.1.96",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",