@pisell/pisellos 2.1.107 → 2.1.109

package/lib/modules/Rules/index.js

@@ -95,7 +95,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     if (productList.every((item) => {
       var _a;
       const product = this.hooks.getProduct(item);
-      return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || (newDiscountList[0].tag === "good_pass" ? product.price == 0 : product.total == 0));
+      return product.booking_id && (((_a = product.discount_list) == null ? void 0 : _a.length) || product.total == 0);
     })) {
       return {
         isAvailable: false,
@@ -193,7 +193,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     isFormSubject,
     orderTotalAmount
   }, options) {
-    const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -346,6 +345,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return compareByExpireTime(a, b);
     });
     const flattenedList = flattenProductsWithBundle(productList);
+    const isEditModeAddNewProduct = flattenedList.find((n) => n.booking_id) && flattenedList.find((n) => !n.booking_id);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
       var _a, _b;
       const priceA = new import_decimal.default(
@@ -388,12 +388,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             available_product_type: (_a = discount.limited_relation_product_data) == null ? void 0 : _a.type,
             available_product_ids: (_b = discount.limited_relation_product_data) == null ? void 0 : _b.product_ids
           };
-          const productsForEvaluate = sortedFlattenedList.map((item) => ({
-            product_id: item.id,
-            price: item.price || 0,
-            quantity: item.quantity || item.num || 1,
-            selling_price: item.price || 0
-          }));
+          const productsForEvaluate = sortedFlattenedList.map((item) => {
+            var _a2;
+            return {
+              product_id: item.id,
+              price: item.price || 0,
+              quantity: item.quantity || item.num || 1,
+              selling_price: item.price || 0,
+              product_options: item.type === "main" ? (_a2 = item.product) == null ? void 0 : _a2.options : void 0
+            };
+          });
           const result = evaluator.checkVoucherAvailability({
             orderTotalAmount,
             products: productsForEvaluate,
@@ -562,6 +566,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         originProduct = flatItem.originProduct;
       } else {
         product = {
+          startDate: (_a = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _a.startDate,
           _id: flatItem._id,
           id: flatItem.id,
           price: flatItem.price,
@@ -570,8 +575,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           total: flatItem.total,
           origin_total: flatItem.origin_total,
           booking_id: flatItem.booking_id,
-          discount_list: flatItem.discount_list || [],
-          startDate: (_a = flatItem.parentProduct) == null ? void 0 : _a.startDate
+          discount_list: flatItem.discount_list || []
         };
         originProduct = flatItem.originProduct;
       }
@@ -630,25 +634,69 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
+    const applyDiscountToOptions = (options2, discount) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return { discountedOptions: options2, optionDiscountAmount: 0 };
+      let optionDiscountAmount = 0;
+      const discountedOptions = options2.map((option) => {
+        const rawUnit = option._original_price ?? option._original_add_price ?? option.price ?? option.add_price;
+        const baseUnitNum = Number(rawUnit ?? 0);
+        if (baseUnitNum <= 0)
+          return option;
+        const discountedPrice = (0, import_utils.getDiscountAmount)(discount, baseUnitNum, baseUnitNum);
+        const optQty = Number(option.num ?? option.quantity ?? 1);
+        optionDiscountAmount = new import_decimal.default(optionDiscountAmount).plus(new import_decimal.default(baseUnitNum).minus(discountedPrice).mul(optQty)).toNumber();
+        const { _original_add_price, ...rest } = option;
+        const tmpl = rest.price ?? rest.add_price;
+        const nextPrice = typeof tmpl === "string" ? String(discountedPrice) : discountedPrice;
+        return {
+          ...rest,
+          _original_price: option._original_price ?? (_original_add_price !== void 0 ? _original_add_price : rawUnit),
+          price: nextPrice
+        };
+      });
+      return { discountedOptions, optionDiscountAmount };
+    };
+    const restoreOptionPrices = (options2) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return options2;
+      return options2.map((option) => {
+        const orig = option._original_price !== void 0 ? option._original_price : option._original_add_price;
+        if (orig !== void 0) {
+          const { _original_price, _original_add_price, ...rest } = option;
+          return { ...rest, price: orig };
+        }
+        return option;
+      });
+    };
+    const getOptionTotal = (options2) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return 0;
+      return options2.reduce((sum, opt) => {
+        const unit = Number(opt.price ?? opt.add_price ?? 0);
+        const n = Number(opt.num ?? opt.quantity ?? 1);
+        return new import_decimal.default(sum).plus(new import_decimal.default(unit).mul(n)).toNumber();
+      }, 0);
+    };
     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, _C, _D, _E, _F, _G, _H, _I, _J;
+      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, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
         originProduct = flatItem.originProduct;
       } else {
         product = {
+          startDate: (_a = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _a.startDate,
           _id: flatItem._id,
           id: flatItem.id,
           price: flatItem.price,
           quantity: flatItem.quantity,
           num: flatItem.num,
           total: flatItem.total,
-          original_price: (_a = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _a.original_price,
-          origin_total: (_b = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _b.original_price,
+          original_price: (_b = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _b.original_price,
+          origin_total: (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.original_price,
           booking_id: flatItem.booking_id,
-          discount_list: ((_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) || [],
-          startDate: (_d = flatItem.parentProduct) == null ? void 0 : _d.startDate
+          discount_list: ((_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) || []
         };
         originProduct = flatItem.originProduct;
       }
@@ -709,11 +757,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
         }
         const limitedData = discount.limited_relation_product_data;
-        let timeLimit = true;
-        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
-        if (!timeLimit) {
-          return false;
-        }
         const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
         const isHolderMatch = this.checkHolderMatch(
           discount,
@@ -725,6 +768,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         );
         if (!isHolderMatch)
           return false;
+        let timeLimit = true;
+        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
+        if (!timeLimit) {
+          return false;
+        }
         if (limitedData.type === "product_all") {
           if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
             return false;
@@ -747,17 +795,30 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
       if (flatItem.type === "main") {
-        isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every((item) => {
-          var _a2;
-          return !((_a2 = item.discount_list || []) == null ? void 0 : _a2.length);
-        }) && (!((_g = product.discount_list) == null ? void 0 : _g.length) || ((_i = (_h = product == null ? void 0 : product.discount_list) == null ? void 0 : _h.every) == null ? void 0 : _i.call(_h, (item) => item.type === "product")));
+        isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(
+          (item) => {
+            var _a2;
+            return !((_a2 = item.discount_list || []) == null ? void 0 : _a2.length);
+          }
+        ) && (!((_g = product.discount_list) == null ? void 0 : _g.length) || ((_i = (_h = product == null ? void 0 : product.discount_list) == null ? void 0 : _h.every) == null ? void 0 : _i.call(
+          _h,
+          (item) => item.type === "product"
+        )));
+        if (product.inPromotion) {
+          isManualDiscount = false;
+        }
       } else {
         const parentProduct = flatItem.parentProduct;
         if (parentProduct) {
-          isManualDiscount = typeof parentProduct.isManualDiscount === "boolean" ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every((item) => {
-            var _a2;
-            return !((_a2 = item.discount_list || []) == null ? void 0 : _a2.length);
-          }) && (!((_j = parentProduct.discount_list) == null ? void 0 : _j.length) || ((_l = (_k = parentProduct == null ? void 0 : parentProduct.discount_list) == null ? void 0 : _k.every) == null ? void 0 : _l.call(_k, (item) => item.type === "product")));
+          isManualDiscount = typeof parentProduct.isManualDiscount === "boolean" ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(
+            (item) => {
+              var _a2;
+              return !((_a2 = item.discount_list || []) == null ? void 0 : _a2.length);
+            }
+          ) && (!((_j = parentProduct.discount_list) == null ? void 0 : _j.length) || ((_l = (_k = parentProduct == null ? void 0 : parentProduct.discount_list) == null ? void 0 : _k.every) == null ? void 0 : _l.call(
+            _k,
+            (item) => item.type === "product"
+          )));
         }
       }
       if (options == null ? void 0 : options.discountId) {
@@ -809,34 +870,33 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (flatItem.type === "main") {
+          const restoredOptions = restoreOptionPrices(product.options);
           if (product.isClient) {
-            processedProductsMap.set(
-              product._id,
-              [
-                this.hooks.setProduct(originProduct, {
-                  ...isManualDiscount ? {} : {
-                    origin_total: (0, import_utils2.getProductOriginTotalPrice)({
-                      product: {
-                        original_price: product.original_price
-                      },
-                      bundle: product.bundle,
-                      options: product.options
-                    }),
-                    variant: originProduct._productInit.variant,
-                    original_price: originProduct._productInit.original_price,
-                    total: (0, import_utils2.getProductTotalPrice)({
-                      product: {
-                        price: product.price
-                      },
-                      bundle: product.bundle,
-                      options: product.options
-                    }),
-                    price: product.price
-                  },
-                  discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
-                })
-              ]
-            );
+            processedProductsMap.set(product._id, [
+              this.hooks.setProduct(originProduct, {
+                ...isManualDiscount ? {} : {
+                  origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+                    product: {
+                      original_price: product.original_price
+                    },
+                    bundle: product.bundle,
+                    options: restoredOptions
+                  }),
+                  variant: originProduct._productInit.variant,
+                  original_price: originProduct._productInit.original_price,
+                  total: (0, import_utils2.getProductTotalPrice)({
+                    product: {
+                      price: product.price
+                    },
+                    bundle: product.bundle,
+                    options: restoredOptions
+                  }),
+                  price: product.price,
+                  options: restoredOptions
+                },
+                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;
             let main_product_selling_price = product.price ?? product.main_product_selling_price;
@@ -846,17 +906,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }
             processedProductsMap.set(
               product._id,
-              [this.hooks.setProduct(originProduct, {
-                ...isManualDiscount ? {
-                  price: product.price
-                } : {
-                  _id: product._id.split("___")[0] + "___" + index,
-                  total,
-                  price: product.price,
-                  main_product_selling_price
-                },
-                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
-              })]
+              [
+                this.hooks.setProduct(originProduct, {
+                  ...isManualDiscount ? {
+                    price: product.price
+                  } : {
+                    _id: product._id.split("___")[0] + "___" + index,
+                    total,
+                    price: product.price,
+                    main_product_selling_price,
+                    options: restoredOptions
+                  },
+                  discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
+                })
+              ]
             );
           }
         } else {
@@ -900,12 +963,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const arr = [];
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
-          arr.push(this.hooks.setProduct(originProduct, {
-            discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
-            quantity: totalQuantity - splitCount,
-            _id: product._id.split("___")[0],
-            total: product.origin_total || product.total
-          }));
+          let total = product.origin_total ?? product.total;
+          if ((product.discount_list || []).some((item) => item.type === "promotion")) {
+            total = product.total ?? product.origin_total;
+          }
+          arr.push(
+            this.hooks.setProduct(originProduct, {
+              discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
+              quantity: totalQuantity - splitCount,
+              _id: product._id.split("___")[0],
+              total
+            })
+          );
         }
         for (let i = 0; i < splitCount; i++) {
           const currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
@@ -930,29 +999,49 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          let targetProductTotal;
+          const isDeductOptionPrice = !!((_y = selectedDiscount.config) == null ? void 0 : _y.deductOptionPrice);
+          let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
+          let discountedOptions = product.options;
+          let optionDiscountAmount = 0;
           if (isOrderLevel && productAllocation) {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
-            targetProductTotal = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
+            mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
           } else {
-            targetProductTotal = (0, import_utils.getDiscountAmount)(currentSelectedDiscount, product.price, product.price);
-            amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+            mainProductSellingPrice = (0, import_utils.getDiscountAmount)(
+              currentSelectedDiscount,
+              product.price,
+              product.price
+            );
+            amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
+          }
+          if (isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length)) {
+            const optionResult = applyDiscountToOptions(
+              product.options,
+              currentSelectedDiscount
+            );
+            discountedOptions = optionResult.discountedOptions;
+            optionDiscountAmount = optionResult.optionDiscountAmount;
           }
+          const optionsForLineTotal = isDeductOptionPrice && ((_A = product.options) == null ? void 0 : _A.length) ? discountedOptions : product.options;
+          const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
+          const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
+          const mainProductDiscountAmount = amount;
+          const lineDiscountAmount = new import_decimal.default(mainProductDiscountAmount).plus(optionDiscountAmount).toNumber();
           const currentDiscountType = currentSelectedDiscount.tag === "product_discount_card" ? "discount_card" : currentSelectedDiscount.tag;
-          const actualDiscountAmount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+          const discountType2 = selectedDiscount.tag || selectedDiscount.type;
           const currentIsGoodPass = currentDiscountType === "good_pass";
           const discountDetail = {
-            amount: actualDiscountAmount,
-            type: currentDiscountType,
+            amount: lineDiscountAmount,
+            type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : discountType2,
             discount: {
-              discount_card_type: (_y = currentSelectedDiscount == null ? void 0 : currentSelectedDiscount.metadata) == null ? void 0 : _y.discount_card_type,
-              fixed_amount: actualDiscountAmount,
-              discount_calculation_mode: (_z = currentSelectedDiscount == null ? void 0 : currentSelectedDiscount.metadata) == null ? void 0 : _z.discount_calculation_mode,
-              resource_id: currentSelectedDiscount.id,
-              title: currentSelectedDiscount.format_title,
+              discount_card_type: (_B = selectedDiscount == null ? void 0 : selectedDiscount.metadata) == null ? void 0 : _B.discount_card_type,
+              fixed_amount: lineDiscountAmount,
+              discount_calculation_mode: (_C = selectedDiscount == null ? void 0 : selectedDiscount.metadata) == null ? void 0 : _C.discount_calculation_mode,
+              resource_id: selectedDiscount.id,
+              title: selectedDiscount.format_title,
               original_amount: product.price,
               product_id: originProduct.id,
               percent: currentSelectedDiscount.par_value,
@@ -965,35 +1054,32 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               num: 1,
               discount_rule_uncheck_flag: selectedDiscount == null ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
               // 🔥 order_level 分摊差值
-              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference },
+              /** 仅主商品上的优惠金额（不含 option） */
+              mainProductDiscountAmount,
+              optionDiscountAmount
             }
           };
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
-          let total = targetProductTotal;
-          if (product.options) {
-            total = product.options.reduce((accumulator, currentValue) => {
-              const currentPrice = new import_decimal.default(currentValue.price || 0);
-              const currentNum = new import_decimal.default(currentValue.num || 0);
-              return accumulator.add(currentPrice.mul(currentNum));
-            }, new import_decimal.default(total)).toNumber();
-          }
           if (product.isClient) {
             arr.push(
               this.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: currentIsGoodPass ? product.price - discountDetail.amount : product.price,
+                // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
+                price: currentIsGoodPass ? mainProductSellingPrice : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoreOptionPrices(product.options)
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new import_decimal.default(product.price || 0).toNumber(),
-                total: targetProductTotal
+                total,
+                options: discountedOptions
               })
             );
           } else {
@@ -1003,9 +1089,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 _id: product._id.split("___")[0] + "___" + currentSelectedDiscount.id + "_" + i + "_" + index,
                 price: currentIsGoodPass ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: targetProductTotal,
+                total,
                 origin_total: productOriginTotal,
-                main_product_selling_price: targetProductTotal
+                main_product_selling_price: mainProductSellingPrice,
+                options: discountedOptions
               })
             );
           }
@@ -1040,8 +1127,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               amount: bundleDiscountAmount,
               type: bundleDiscountType,
               discount: {
-                discount_card_type: (_A = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _A.discount_card_type,
-                discount_calculation_mode: (_B = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _B.discount_calculation_mode,
+                discount_card_type: (_D = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _D.discount_card_type,
+                discount_calculation_mode: (_E = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _E.discount_calculation_mode,
                 fixed_amount: bundleDiscountAmount,
                 resource_id: currentBundleDiscount.id,
                 title: currentBundleDiscount.format_title,
@@ -1149,7 +1236,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             const nextDiscType = nextSelectedDiscount.tag || nextSelectedDiscount.type;
             const nextIsGoodPass = nextDiscType === "good_pass";
             const nextIsDiscountCard = ["discount_card", "product_discount_card"].includes(nextDiscType);
-            const nextApplicableProductLimit = ((_C = nextSelectedDiscount.config) == null ? void 0 : _C.applicableProductLimit) || 0;
+            const nextApplicableProductLimit = ((_F = nextSelectedDiscount.config) == null ? void 0 : _F.applicableProductLimit) || 0;
             const nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
             if (!nextIsNeedSplit) {
               const nextBundleDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
@@ -1172,7 +1259,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 amount: nextDiscountAmount * remainingNum,
                 type: nextBundleDiscType,
                 discount: {
-                  discount_card_type: (_D = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _D.discount_card_type,
+                  discount_card_type: (_G = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _G.discount_card_type,
                   fixed_amount: nextDiscountAmount,
                   resource_id: nextBundleDiscount.id,
                   title: nextBundleDiscount.format_title,
@@ -1186,7 +1273,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   num: remainingNum
                 },
                 config: nextBundleDiscount == null ? void 0 : nextBundleDiscount.config,
-                _num: remainingNum * (((_E = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _E.num) || 1)
+                _num: remainingNum * (((_H = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _H.num) || 1)
               };
               const nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
               nextAppliedProducts.push(nextDiscountDetail);
@@ -1210,7 +1297,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 (item) => (item.tag || item.type) === "good_pass"
               ).length;
               nextMaxUsageLimit = nextGoodPassCount;
-              if ((_F = nextSelectedDiscount.config) == null ? void 0 : _F.maxUsagePerOrder) {
+              if ((_I = nextSelectedDiscount.config) == null ? void 0 : _I.maxUsagePerOrder) {
                 const usedCount = usedProductIdCounts.get(nextSelectedDiscount.product_id) || 0;
                 nextMaxUsageLimit = Math.min(
                   nextGoodPassCount,
@@ -1259,7 +1346,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 amount: nextBundleDiscAmount,
                 type: nextBundleDiscTypeStr,
                 discount: {
-                  discount_card_type: (_G = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _G.discount_card_type,
+                  discount_card_type: (_J = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _J.discount_card_type,
                   fixed_amount: nextBundleDiscAmount,
                   resource_id: nextBundleDiscount.id,
                   title: nextBundleDiscount.format_title,
@@ -1331,9 +1418,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: bundleActualDiscountAmount * (product.num || 1),
             type: currentBundleDiscount.tag === "product_discount_card" ? "discount_card" : currentBundleDiscount.tag,
             discount: {
-              discount_card_type: (_H = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _H.discount_card_type,
+              discount_card_type: (_K = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _K.discount_card_type,
               fixed_amount: bundleActualDiscountAmount,
-              discount_calculation_mode: (_I = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _I.discount_calculation_mode,
+              discount_calculation_mode: (_L = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _L.discount_calculation_mode,
               resource_id: currentBundleDiscount.id,
               title: currentBundleDiscount.format_title,
               original_amount: product.original_price,
@@ -1350,7 +1437,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: currentBundleDiscount == null ? void 0 : currentBundleDiscount.config,
-            _num: (product.num || 1) * (((_J = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _J.num) || 1)
+            _num: (product.num || 1) * (((_M = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _M.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(currentBundleDiscount.id) || [];
           appliedProducts.push(discountDetail);
@@ -1373,6 +1460,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const mainProductArr = processedProductsMap2.get(product._id);
         if (!mainProductArr || mainProductArr.length === 0) {
           const getDefaultProduct = () => {
+            const restoredOptions = restoreOptionPrices(product.options);
             if (product.isClient) {
               return this.hooks.setProduct(originProduct, {
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
@@ -1382,7 +1470,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoredOptions
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: originProduct._productInit.original_price,
@@ -1391,15 +1479,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     price: product.price
                   },
                   bundle: product.bundle,
-                  options: product.options
-                })
+                  options: restoredOptions
+                }),
+                options: restoredOptions
               });
             } else {
               return this.hooks.setProduct(originProduct, {
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 total: product.total,
                 origin_total: product.origin_total,
-                price: product.price
+                price: product.price,
+                options: restoreOptionPrices(product.options)
               });
             }
           };
@@ -1446,20 +1536,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 ) || [bundleItem];
                 if (processedItems.length > 1) {
                   processedItems.forEach((item) => {
-                    const updatedDiscountList2 = (item.discount_list || []).map(
-                      (discount) => {
-                        var _a;
-                        return {
-                          ...discount,
-                          metadata: {
-                            ...discount.metadata,
-                            num: item.num,
-                            custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
-                          }
-                          // num: item.num, // 使用拆分后的 num
-                        };
-                      }
-                    );
+                    const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
+                      var _a;
+                      return {
+                        ...discount,
+                        metadata: {
+                          ...discount.metadata,
+                          num: item.num,
+                          custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
+                        }
+                        // num: item.num, // 使用拆分后的 num
+                      };
+                    });
                     newBundleWithDiscount.push({
                       ...bundleItem,
                       _id: item._id,
@@ -1473,20 +1561,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 } else {
                   const item = processedItems[0];
                   if (item.processed) {
-                    const updatedDiscountList2 = (item.discount_list || []).map(
-                      (discount) => {
-                        var _a;
-                        return {
-                          ...discount,
-                          metadata: {
-                            ...discount.metadata,
-                            num: item.num,
-                            custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
-                          }
-                          // num: item.num, // 使用当前的 num
-                        };
-                      }
-                    );
+                    const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
+                      var _a;
+                      return {
+                        ...discount,
+                        metadata: {
+                          ...discount.metadata,
+                          num: item.num,
+                          custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
+                        }
+                        // num: item.num, // 使用当前的 num
+                      };
+                    });
                     newBundleWithDiscount.push({
                       ...bundleItem,
                       _id: item._id,
@@ -1664,7 +1750,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                           price: item.price,
                           num: item.num,
                           quantity: item.num,
-                          discount_list: updatedDiscountList2
+                          discount_list: updatedDiscountList2,
+                          bundle_selling_price: bundleItem.bundle_selling_price !== void 0 ? item.price : void 0
                         });
                       });
                     }

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

@@ -67,6 +67,7 @@ export interface RulesParamsHooks {
         quantity?: number;
         bundle?: any[];
         main_product_selling_price?: string | number;
+        options?: any[];
     }) => Record<string, any>;
 }
 export {};

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;