@pisell/pisellos 2.1.105 → 2.1.107

package/lib/modules/Rules/index.js

@@ -50,6 +50,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     this.core = core;
     this.hooks = options == null ? void 0 : options.hooks;
     this.store = options == null ? void 0 : options.store;
+    this.window = core.getPlugin("window");
   }
   async setRulesList(rulesList) {
     this.store.rulesList = rulesList;
@@ -71,11 +72,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return false;
     return (productHolderId || orderHolderId) === discount.holder.holder_id;
   }
+  getWalletPassEvaluator() {
+    var _a, _b;
+    return (_b = (_a = this.window).getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
+  }
   // 判断discountList 是否可以对当前productList生效
   isDiscountListAvailable({
     oldDiscountList,
     newDiscountList,
     productList,
+    orderTotalAmount,
     holders,
     isFormSubject
   }) {
@@ -108,6 +114,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList],
+      orderTotalAmount,
       holders,
       isFormSubject
     }, {
@@ -183,8 +190,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList,
     holders,
-    isFormSubject
+    isFormSubject,
+    orderTotalAmount
   }, options) {
+    const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -337,7 +346,6 @@ 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(
@@ -362,7 +370,59 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       return priceB.minus(priceA).toNumber();
     });
+    const evaluator = this.getWalletPassEvaluator();
+    if (evaluator) {
+      addModeDiscount.forEach((discount) => {
+        var _a, _b;
+        const discountType = discount.tag || discount.type;
+        if (["good_pass", "discount_card", "product_discount_card"].includes(
+          discountType
+        )) {
+          const voucher = {
+            id: discount.id,
+            amount: Number(discount.par_value || 0),
+            balance: Number(discount.balance || 0),
+            type: discountType,
+            product_id: discount.product_id,
+            unified_available_status: 1,
+            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 result = evaluator.checkVoucherAvailability({
+            orderTotalAmount,
+            products: productsForEvaluate,
+            vouchers: [voucher]
+          });
+          if (result.isAvailable) {
+            discount.config = {
+              ...result.config,
+              isAvailable: true
+            };
+          } else {
+            discount.config = {
+              isAvailable: false
+            };
+          }
+        }
+      });
+    }
     const usedDiscounts = /* @__PURE__ */ new Map();
+    const usedProductIdCounts = /* @__PURE__ */ new Map();
+    const usedDiscountCardLimitCounts = /* @__PURE__ */ new Map();
+    editModeDiscount.forEach((discount) => {
+      var _a;
+      const discountType = discount.tag || discount.type;
+      if (["discount_card", "product_discount_card"].includes(discountType)) {
+        const currentCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
+        usedDiscountCardLimitCounts.set(discount.id, currentCount + (((_a = discount.metadata) == null ? void 0 : _a.num) || 1));
+      }
+    });
     const discountApplicability = /* @__PURE__ */ new Map();
     const discountApplicableProducts = /* @__PURE__ */ new Map();
     addModeDiscount.forEach((discount) => {
@@ -516,7 +576,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         originProduct = flatItem.originProduct;
       }
       addModeDiscount.forEach((discount) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
         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(
@@ -529,7 +589,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         );
         let timeLimit = true;
         timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
-        const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+        const isLimitedProduct = (limitedData.type === "product_all" && limitedData.filter !== 1 || limitedData.type === "product_all" && limitedData.filter === 1 && !limitedData.exclude_product_ids.includes(product.id) || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
         const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a2 = product == null ? void 0 : product.discount_list) == null ? void 0 : _a2.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every(
           (discount2) => discount2.id && [
             "good_pass",
@@ -538,8 +598,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           ].includes(discount2.tag || discount2.type)
         ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) == null ? void 0 : _d.length) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.every((discount2) => discount2.id)));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
-          (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
+        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && ((_g = discount.config) == null ? void 0 : _g.isAvailable)) {
+          (_h = discountApplicability.get(discount.id)) == null ? void 0 : _h.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
           const isGoodPass = discountType === "good_pass";
@@ -549,14 +609,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
-              discount_card_type: (_h = discount == null ? void 0 : discount.metadata) == null ? void 0 : _h.discount_card_type,
+              discount_card_type: (_i = discount == null ? void 0 : discount.metadata) == null ? void 0 : _i.discount_card_type,
               fixed_amount: product.price,
-              discount_calculation_mode: (_i = discount == null ? void 0 : discount.metadata) == null ? void 0 : _i.discount_calculation_mode,
+              discount_calculation_mode: (_j = discount == null ? void 0 : discount.metadata) == null ? void 0 : _j.discount_calculation_mode,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.price || product.origin_total,
               pre_value: discount.par_value,
-              product_id: originProduct.id
+              product_id: originProduct.id,
+              discount_product_id: discount.product_id
             },
             metadata: {
               num,
@@ -570,7 +631,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, _C;
+      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;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -591,22 +652,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
-      if ((product == null ? void 0 : product.booking_id) && ((_e = product.discount_list) == null ? void 0 : _e.length) && ((_f = product == null ? void 0 : product.discount_list) == null ? void 0 : _f.every((discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
+      if ((product == null ? void 0 : product.booking_id) && ((_e = product.discount_list) == null ? void 0 : _e.length) && ((_f = product == null ? void 0 : product.discount_list) == null ? void 0 : _f.every(
+        (discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(
+          discount.tag || discount.type
+        )
+      ))) {
         if (flatItem.type === "main") {
           processedProductsMap.set(product._id, [originProduct]);
         } else {
-          processedFlatItemsMap.set(flatItem._id, [{
-            ...flatItem,
-            processed: true
-          }]);
+          processedFlatItemsMap.set(flatItem._id, [
+            {
+              ...flatItem,
+              processed: true
+            }
+          ]);
         }
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        var _a2, _b2;
-        if ((Number(product.price) <= 0 || !product.price) && !((_a2 = product.discount_list) == null ? void 0 : _a2.length) && (discount.tag || discount.type) === "good_pass")
+        var _a2, _b2, _c2, _d2, _e2;
+        const discountType2 = discount.tag || discount.type;
+        if (["good_pass", "discount_card", "product_discount_card"].includes(
+          discountType2
+        )) {
+          if (discount.config === void 0 || !((_a2 = discount == null ? void 0 : discount.config) == null ? void 0 : _a2.isAvailable)) {
+            return false;
+          }
+        }
+        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.length) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
+        if ((Number(product.price) <= 0 || !product.price) && !((_c2 = product.discount_list) == null ? void 0 : _c2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -614,7 +689,31 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
+        if ((discount.tag || discount.type) === "good_pass") {
+          const maxUsagePerOrder = (_d2 = discount.config) == null ? void 0 : _d2.maxUsagePerOrder;
+          if (maxUsagePerOrder && maxUsagePerOrder > 0) {
+            const currentUsedCount = usedProductIdCounts.get(discount.product_id) || 0;
+            if (currentUsedCount >= maxUsagePerOrder) {
+              return false;
+            }
+          }
+        }
+        const discountTypeForLimit = discount.tag || discount.type;
+        if (["discount_card", "product_discount_card"].includes(discountTypeForLimit)) {
+          const applicableProductLimitConfig = ((_e2 = discount.config) == null ? void 0 : _e2.applicableProductLimit) || 0;
+          if (applicableProductLimitConfig > 0) {
+            const currentUsedLimitCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
+            if (currentUsedLimitCount >= applicableProductLimitConfig) {
+              return false;
+            }
+          }
+        }
         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,
@@ -626,12 +725,10 @@ 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;
+          }
           if (!this.checkPackageSubItemUsageRules(discount, flatItem)) {
             return false;
           }
@@ -644,7 +741,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscountCard = applicableDiscounts.find((n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass");
+      const selectedDiscountCard = applicableDiscounts.find(
+        (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
+      );
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
       if (flatItem.type === "main") {
@@ -713,28 +812,30 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           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")
-              })]
+              [
+                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")
+                })
+              ]
             );
           } 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;
@@ -771,32 +872,63 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined" && !(options == null ? void 0 : options.scan) && !isEditModeAddNewProduct) {
         return;
       }
-      const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
+      const discountType = selectedDiscount.tag || selectedDiscount.type;
+      const isGoodPass = discountType === "good_pass";
+      const isDiscountCard = ["discount_card", "product_discount_card"].includes(discountType);
+      const applicableProductLimit = ((_w = selectedDiscount.config) == null ? void 0 : _w.applicableProductLimit) || 0;
+      const isNeedSplit = isGoodPass || isDiscountCard && applicableProductLimit > 0;
       const totalQuantity = product.quantity || product.num || 1;
-      const availableGoodPassCount = applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length;
-      const splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
+      const availableGoodPassCount = applicableDiscounts.filter(
+        (item) => (item.tag || item.type) === "good_pass"
+      ).length;
+      let maxUsageLimit;
+      if (isGoodPass) {
+        maxUsageLimit = availableGoodPassCount;
+        if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
+          maxUsageLimit = Math.min(
+            availableGoodPassCount,
+            selectedDiscount.config.maxUsagePerOrder
+          );
+        }
+      } else if (isDiscountCard && applicableProductLimit > 0) {
+        const usedLimitCount = usedDiscountCardLimitCounts.get(selectedDiscount.id) || 0;
+        maxUsageLimit = Math.max(0, applicableProductLimit - usedLimitCount);
+      } else {
+        maxUsageLimit = 1;
+      }
+      const splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, maxUsageLimit) : 1;
       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]
+            _id: product._id.split("___")[0],
+            total: product.origin_total || product.total
           }));
         }
         for (let i = 0; i < splitCount; i++) {
-          const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
-          usedDiscounts.set(selectedDiscount2.id, true);
-          const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
+          const currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
+          usedDiscounts.set(currentSelectedDiscount.id, true);
+          if ((currentSelectedDiscount.tag || currentSelectedDiscount.type) === "good_pass") {
+            const currentCount = usedProductIdCounts.get(currentSelectedDiscount.product_id) || 0;
+            usedProductIdCounts.set(currentSelectedDiscount.product_id, currentCount + 1);
+          }
+          const currentDiscountTypeForCount = currentSelectedDiscount.tag || currentSelectedDiscount.type;
+          if (["discount_card", "product_discount_card"].includes(currentDiscountTypeForCount)) {
+            const currentLimitCount = usedDiscountCardLimitCounts.get(currentSelectedDiscount.id) || 0;
+            usedDiscountCardLimitCounts.set(currentSelectedDiscount.id, currentLimitCount + 1);
+          }
+          const appliedProducts = appliedDiscountProducts.get(currentSelectedDiscount.id) || [];
           let productOriginTotal = product.origin_total || product.total || 0;
           if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_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) {
+          if (Number(((_x = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _x.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
-          const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
+          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;
           let amount;
@@ -806,35 +938,38 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             productDiscountDifference = productAllocation.difference;
             targetProductTotal = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
           } else {
-            targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
+            targetProductTotal = (0, import_utils.getDiscountAmount)(currentSelectedDiscount, product.price, product.price);
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
           }
-          const discountType = selectedDiscount2.tag || selectedDiscount2.type;
-          const isGoodPass = discountType === "good_pass";
+          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 currentIsGoodPass = currentDiscountType === "good_pass";
           const discountDetail = {
-            amount,
-            type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
+            amount: actualDiscountAmount,
+            type: currentDiscountType,
             discount: {
-              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
-              fixed_amount: amount,
-              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,
+              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,
               original_amount: product.price,
               product_id: originProduct.id,
-              percent: selectedDiscount2.par_value
+              percent: currentSelectedDiscount.par_value,
+              discount_product_id: currentSelectedDiscount.product_id
             },
-            // 前端使用的num数量，为了计算优惠金额
-            _num: isGoodPass ? 1 : product.num,
+            // 前端使用的num数量，为了计算优惠金额（拆分时为1）
+            _num: isNeedSplit ? 1 : product.num,
+            config: currentSelectedDiscount == null ? void 0 : currentSelectedDiscount.config,
             metadata: {
               num: 1,
-              discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
+              discount_rule_uncheck_flag: selectedDiscount == null ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             }
           };
           appliedProducts.push(discountDetail);
-          appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+          appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
           let total = targetProductTotal;
           if (product.options) {
             total = product.options.reduce((accumulator, currentValue) => {
@@ -844,31 +979,35 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }, new import_decimal.default(total)).toNumber();
           }
           if (product.isClient) {
-            arr.push(this.hooks.setProduct(originProduct, {
-              discount_list: [discountDetail],
-              price: selectedDiscount2.tag === "good_pass" ? 0 : 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
-              }),
-              variant: originProduct._productInit.variant,
-              original_price: new import_decimal.default(product.price || 0).toNumber(),
-              total
-            }));
+            arr.push(
+              this.hooks.setProduct(originProduct, {
+                discount_list: [discountDetail],
+                price: currentIsGoodPass ? product.price - discountDetail.amount : 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
+                }),
+                variant: originProduct._productInit.variant,
+                original_price: new import_decimal.default(product.price || 0).toNumber(),
+                total: targetProductTotal
+              })
+            );
           } else {
-            arr.push(this.hooks.setProduct(originProduct, {
-              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,
-              total,
-              origin_total: productOriginTotal,
-              main_product_selling_price: targetProductTotal
-            }));
+            arr.push(
+              this.hooks.setProduct(originProduct, {
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion").concat([discountDetail]),
+                _id: product._id.split("___")[0] + "___" + currentSelectedDiscount.id + "_" + i + "_" + index,
+                price: currentIsGoodPass ? 0 : product.price,
+                quantity: isNeedSplit ? 1 : product.quantity,
+                total: targetProductTotal,
+                origin_total: productOriginTotal,
+                main_product_selling_price: targetProductTotal
+              })
+            );
           }
         }
         processedProductsMap.set(product._id, arr);
@@ -878,62 +1017,298 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const discountNum = splitCount;
           const normalNum = totalQuantity - discountNum;
           for (let i = 0; i < discountNum; i++) {
-            const selectedDiscount2 = applicableDiscounts[i];
-            usedDiscounts.set(selectedDiscount2.id, true);
+            const currentBundleDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
+            usedDiscounts.set(currentBundleDiscount.id, true);
+            if ((currentBundleDiscount.tag || currentBundleDiscount.type) === "good_pass") {
+              const currentCount = usedProductIdCounts.get(currentBundleDiscount.product_id) || 0;
+              usedProductIdCounts.set(currentBundleDiscount.product_id, currentCount + 1);
+            }
+            const bundleDiscountTypeForCount = currentBundleDiscount.tag || currentBundleDiscount.type;
+            if (["discount_card", "product_discount_card"].includes(bundleDiscountTypeForCount)) {
+              const currentBundleLimitCount = usedDiscountCardLimitCounts.get(currentBundleDiscount.id) || 0;
+              usedDiscountCardLimitCounts.set(currentBundleDiscount.id, currentBundleLimitCount + 1);
+            }
             const uniqueId = `${flatItem._id}_split_${i}`;
+            const discountedPrice = (0, import_utils.getDiscountAmount)(
+              currentBundleDiscount,
+              product.origin_total,
+              product.origin_total
+            );
+            const bundleDiscountAmount = new import_decimal.default(product.origin_total || 0).minus(discountedPrice).toNumber();
+            const bundleDiscountType = currentBundleDiscount.tag === "product_discount_card" ? "discount_card" : currentBundleDiscount.tag;
             const discountDetail = {
-              amount: product.origin_total,
-              type: "good_pass",
+              amount: bundleDiscountAmount,
+              type: bundleDiscountType,
               discount: {
-                fixed_amount: product.origin_total,
-                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,
+                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,
+                fixed_amount: bundleDiscountAmount,
+                resource_id: currentBundleDiscount.id,
+                title: currentBundleDiscount.format_title,
                 original_amount: product.origin_total,
-                product_id: product.id
+                product_id: product.id,
+                percent: currentBundleDiscount.par_value,
+                discount_product_id: currentBundleDiscount.product_id
               },
               metadata: {
                 // 🔥 使用拆分后的唯一 _id
                 custom_product_bundle_map_id: uniqueId,
-                discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
+                discount_rule_uncheck_flag: selectedDiscount == null ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
                 num: 1
               },
-              _num: 1
+              _num: 1,
+              config: currentBundleDiscount == null ? void 0 : currentBundleDiscount.config
             };
-            const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
+            const appliedProducts = appliedDiscountProducts.get(currentBundleDiscount.id) || [];
             appliedProducts.push(discountDetail);
-            appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+            appliedDiscountProducts.set(currentBundleDiscount.id, appliedProducts);
             processedItems.push({
               ...flatItem,
               // 🔥 使用唯一的 _id
               _id: uniqueId,
               num: 1,
               quantity: 1,
-              price: 0,
-              // 商品券价格为0
-              total: 0,
+              price: discountedPrice,
+              // 折扣后的价格
+              total: discountedPrice,
               discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion").concat([discountDetail]),
               processed: true,
-              _discountId: selectedDiscount2.id
+              _discountId: currentBundleDiscount.id
             });
           }
-          if (normalNum > 0) {
-            processedItems.push({
-              ...flatItem,
-              // 🔥 为剩余商品生成唯一的 _id
-              _id: `${flatItem._id}_split_rest`,
-              num: normalNum,
-              quantity: normalNum,
-              discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion"),
-              processed: true
+          let remainingNum = normalNum;
+          let continueSplitIndex = discountNum;
+          while (remainingNum > 0) {
+            const nextApplicableDiscounts = sortedDiscountList.filter((nextDiscount) => {
+              var _a2, _b2, _c2, _d2;
+              const nextDiscountType = nextDiscount.tag || nextDiscount.type;
+              if (["good_pass", "discount_card", "product_discount_card"].includes(nextDiscountType)) {
+                if (nextDiscount.config === void 0 || !((_a2 = nextDiscount == null ? void 0 : nextDiscount.config) == null ? void 0 : _a2.isAvailable)) {
+                  return false;
+                }
+              }
+              if ((Number(product.total) <= 0 || !product.total) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find(
+                (n) => {
+                  var _a3;
+                  return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === nextDiscount.id;
+                }
+              )) && nextDiscountType !== "good_pass")
+                return false;
+              if (usedDiscounts.get(nextDiscount.id) && nextDiscountType === "good_pass")
+                return false;
+              if (nextDiscountType === "good_pass") {
+                const maxUsagePerOrder = (_c2 = nextDiscount.config) == null ? void 0 : _c2.maxUsagePerOrder;
+                if (maxUsagePerOrder && maxUsagePerOrder > 0) {
+                  const currentUsedCount = usedProductIdCounts.get(nextDiscount.product_id) || 0;
+                  if (currentUsedCount >= maxUsagePerOrder) {
+                    return false;
+                  }
+                }
+              }
+              if (["discount_card", "product_discount_card"].includes(nextDiscountType)) {
+                const limitConfig = ((_d2 = nextDiscount.config) == null ? void 0 : _d2.applicableProductLimit) || 0;
+                if (limitConfig > 0) {
+                  const currentUsedLimitCount = usedDiscountCardLimitCounts.get(nextDiscount.id) || 0;
+                  if (currentUsedLimitCount >= limitConfig) {
+                    return false;
+                  }
+                }
+              }
+              const limitedData = nextDiscount.limited_relation_product_data;
+              if (limitedData.type === "product_all") {
+                if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+                  return false;
+                }
+                if (!this.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
+                  return false;
+                }
+                return true;
+              } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
+                if (!this.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
+                  return false;
+                }
+                return true;
+              }
+              return false;
             });
+            if (nextApplicableDiscounts.length === 0) {
+              processedItems.push({
+                ...flatItem,
+                _id: `${flatItem._id}_split_rest`,
+                num: remainingNum,
+                quantity: remainingNum,
+                discount_list: [],
+                processed: true
+              });
+              break;
+            }
+            const nextSelectedDiscountCard = nextApplicableDiscounts.find(
+              (n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass"
+            );
+            const nextSelectedDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
+            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 nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
+            if (!nextIsNeedSplit) {
+              const nextBundleDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
+              usedDiscounts.set(nextBundleDiscount.id, true);
+              if ((nextBundleDiscount.tag || nextBundleDiscount.type) === "good_pass") {
+                const curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
+                usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
+              }
+              const nextNoSplitType = nextBundleDiscount.tag || nextBundleDiscount.type;
+              if (["discount_card", "product_discount_card"].includes(nextNoSplitType)) {
+                const curCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
+                usedDiscountCardLimitCounts.set(nextBundleDiscount.id, curCount + remainingNum);
+              }
+              const nextOriginTotal = product.original_price || product.price || 0;
+              const nextTargetTotal = (0, import_utils.getDiscountAmount)(nextBundleDiscount, nextOriginTotal, nextOriginTotal);
+              const nextDiscountAmount = new import_decimal.default(nextOriginTotal).minus(nextTargetTotal).toNumber();
+              const nextUniqueId = `${flatItem._id}_split_${continueSplitIndex}`;
+              const nextBundleDiscType = nextBundleDiscount.tag === "product_discount_card" ? "discount_card" : nextBundleDiscount.tag;
+              const nextDiscountDetail = {
+                amount: nextDiscountAmount * remainingNum,
+                type: nextBundleDiscType,
+                discount: {
+                  discount_card_type: (_D = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _D.discount_card_type,
+                  fixed_amount: nextDiscountAmount,
+                  resource_id: nextBundleDiscount.id,
+                  title: nextBundleDiscount.format_title,
+                  original_amount: product.original_price,
+                  product_id: product.id,
+                  percent: nextBundleDiscount.par_value,
+                  discount_product_id: nextBundleDiscount.product_id
+                },
+                metadata: {
+                  custom_product_bundle_map_id: nextUniqueId,
+                  num: remainingNum
+                },
+                config: nextBundleDiscount == null ? void 0 : nextBundleDiscount.config,
+                _num: remainingNum * (((_E = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _E.num) || 1)
+              };
+              const nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
+              nextAppliedProducts.push(nextDiscountDetail);
+              appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
+              processedItems.push({
+                ...flatItem,
+                _id: nextUniqueId,
+                num: remainingNum,
+                quantity: remainingNum,
+                total: nextTargetTotal,
+                price: new import_decimal.default(nextOriginTotal || 0).minus(nextDiscountDetail.discount.fixed_amount).toNumber(),
+                discount_list: [nextDiscountDetail],
+                processed: true
+              });
+              remainingNum = 0;
+              break;
+            }
+            let nextMaxUsageLimit;
+            if (nextIsGoodPass) {
+              const nextGoodPassCount = nextApplicableDiscounts.filter(
+                (item) => (item.tag || item.type) === "good_pass"
+              ).length;
+              nextMaxUsageLimit = nextGoodPassCount;
+              if ((_F = nextSelectedDiscount.config) == null ? void 0 : _F.maxUsagePerOrder) {
+                const usedCount = usedProductIdCounts.get(nextSelectedDiscount.product_id) || 0;
+                nextMaxUsageLimit = Math.min(
+                  nextGoodPassCount,
+                  Math.max(0, nextSelectedDiscount.config.maxUsagePerOrder - usedCount)
+                );
+              }
+            } else if (nextIsDiscountCard && nextApplicableProductLimit > 0) {
+              const usedLimitCount = usedDiscountCardLimitCounts.get(nextSelectedDiscount.id) || 0;
+              nextMaxUsageLimit = Math.max(0, nextApplicableProductLimit - usedLimitCount);
+            } else {
+              nextMaxUsageLimit = 1;
+            }
+            const nextSplitCount = Math.min(remainingNum, nextMaxUsageLimit);
+            if (nextSplitCount === 0) {
+              processedItems.push({
+                ...flatItem,
+                _id: `${flatItem._id}_split_rest`,
+                num: remainingNum,
+                quantity: remainingNum,
+                discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion"),
+                processed: true
+              });
+              break;
+            }
+            for (let j = 0; j < nextSplitCount; j++) {
+              const nextBundleDiscount = nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0];
+              usedDiscounts.set(nextBundleDiscount.id, true);
+              if ((nextBundleDiscount.tag || nextBundleDiscount.type) === "good_pass") {
+                const curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
+                usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
+              }
+              const nextBundleDiscTypeForCount = nextBundleDiscount.tag || nextBundleDiscount.type;
+              if (["discount_card", "product_discount_card"].includes(nextBundleDiscTypeForCount)) {
+                const curLimitCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
+                usedDiscountCardLimitCounts.set(nextBundleDiscount.id, curLimitCount + 1);
+              }
+              const nextUniqueId = `${flatItem._id}_split_${continueSplitIndex}`;
+              const nextDiscountedPrice = (0, import_utils.getDiscountAmount)(
+                nextBundleDiscount,
+                product.origin_total,
+                product.origin_total
+              );
+              const nextBundleDiscAmount = new import_decimal.default(product.origin_total || 0).minus(nextDiscountedPrice).toNumber();
+              const nextBundleDiscTypeStr = nextBundleDiscount.tag === "product_discount_card" ? "discount_card" : nextBundleDiscount.tag;
+              const nextDiscountDetail = {
+                amount: nextBundleDiscAmount,
+                type: nextBundleDiscTypeStr,
+                discount: {
+                  discount_card_type: (_G = nextBundleDiscount == null ? void 0 : nextBundleDiscount.metadata) == null ? void 0 : _G.discount_card_type,
+                  fixed_amount: nextBundleDiscAmount,
+                  resource_id: nextBundleDiscount.id,
+                  title: nextBundleDiscount.format_title,
+                  original_amount: product.origin_total,
+                  product_id: product.id,
+                  percent: nextBundleDiscount.par_value,
+                  discount_product_id: nextBundleDiscount.product_id
+                },
+                metadata: {
+                  custom_product_bundle_map_id: nextUniqueId,
+                  num: 1
+                },
+                _num: 1,
+                config: nextBundleDiscount == null ? void 0 : nextBundleDiscount.config
+              };
+              const nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
+              nextAppliedProducts.push(nextDiscountDetail);
+              appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
+              processedItems.push({
+                ...flatItem,
+                _id: nextUniqueId,
+                num: 1,
+                quantity: 1,
+                price: nextDiscountedPrice,
+                total: nextDiscountedPrice,
+                discount_list: [nextDiscountDetail],
+                processed: true,
+                _discountId: nextBundleDiscount.id
+              });
+              continueSplitIndex++;
+            }
+            remainingNum -= nextSplitCount;
           }
         } else {
-          const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[0];
-          usedDiscounts.set(selectedDiscount2.id, true);
+          const currentBundleDiscount = selectedDiscountCard || applicableDiscounts[0];
+          usedDiscounts.set(currentBundleDiscount.id, true);
+          if ((currentBundleDiscount.tag || currentBundleDiscount.type) === "good_pass") {
+            const currentCount = usedProductIdCounts.get(currentBundleDiscount.product_id) || 0;
+            usedProductIdCounts.set(currentBundleDiscount.product_id, currentCount + 1);
+          }
+          const noSplitDiscountType = currentBundleDiscount.tag || currentBundleDiscount.type;
+          if (["discount_card", "product_discount_card"].includes(noSplitDiscountType)) {
+            const bundleQuantity = product.num || 1;
+            const currentNoSplitCount = usedDiscountCardLimitCounts.get(currentBundleDiscount.id) || 0;
+            usedDiscountCardLimitCounts.set(currentBundleDiscount.id, currentNoSplitCount + bundleQuantity);
+          }
           const productOriginTotal = product.original_price || product.price || 0;
-          const isOrderLevel = (0, import_utils.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
-          const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
+          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;
           let fixedAmountPerItem;
@@ -944,39 +1319,42 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             targetProductTotal = Math.max(new import_decimal.default(productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
           } else {
             targetProductTotal = (0, import_utils.getDiscountAmount)(
-              selectedDiscount2,
+              currentBundleDiscount,
               productOriginTotal,
               productOriginTotal
             );
             fixedAmountPerItem = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           }
+          const bundleActualDiscountAmount = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           const uniqueId = flatItem._id;
           const discountDetail = {
-            amount: fixedAmountPerItem * (product.num || 1),
-            type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
+            amount: bundleActualDiscountAmount * (product.num || 1),
+            type: currentBundleDiscount.tag === "product_discount_card" ? "discount_card" : currentBundleDiscount.tag,
             discount: {
-              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
-              fixed_amount: fixedAmountPerItem,
-              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,
+              discount_card_type: (_H = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _H.discount_card_type,
+              fixed_amount: bundleActualDiscountAmount,
+              discount_calculation_mode: (_I = currentBundleDiscount == null ? void 0 : currentBundleDiscount.metadata) == null ? void 0 : _I.discount_calculation_mode,
+              resource_id: currentBundleDiscount.id,
+              title: currentBundleDiscount.format_title,
               original_amount: product.original_price,
               product_id: product.id,
-              percent: selectedDiscount2.par_value
+              percent: currentBundleDiscount.par_value,
+              discount_product_id: currentBundleDiscount.product_id
             },
             metadata: {
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
-              discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
+              discount_rule_uncheck_flag: selectedDiscount == null ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
               num: product.num || 1,
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
-            _num: (product.num || 1) * (((_C = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _C.num) || 1)
+            config: currentBundleDiscount == null ? void 0 : currentBundleDiscount.config,
+            _num: (product.num || 1) * (((_J = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _J.num) || 1)
           };
-          const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
+          const appliedProducts = appliedDiscountProducts.get(currentBundleDiscount.id) || [];
           appliedProducts.push(discountDetail);
-          appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
+          appliedDiscountProducts.set(currentBundleDiscount.id, appliedProducts);
           processedItems.push({
             ...flatItem,
             total: targetProductTotal,
@@ -1061,80 +1439,96 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             const mainProduct = mainProductArr[0];
             const mainProductData = this.hooks.getProduct(mainProduct);
             const newBundleWithDiscount = [];
-            (product.bundle || []).forEach((bundleItem, bundleIndex) => {
-              const processedItems = bundleProcessingInfo.get(bundleIndex) || [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
-                    };
-                  });
-                  newBundleWithDiscount.push({
-                    ...bundleItem,
-                    _id: item._id,
-                    product_id: bundleItem.product_id,
-                    price: item.price,
-                    num: item.num,
-                    discount_list: updatedDiscountList2
-                  });
-                });
-              } 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
+            (product.bundle || []).forEach(
+              (bundleItem, bundleIndex) => {
+                const processedItems = bundleProcessingInfo.get(
+                  bundleIndex
+                ) || [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
+                        };
                       }
-                      // num: item.num, // 使用当前的 num
-                    };
-                  });
-                  newBundleWithDiscount.push({
-                    ...bundleItem,
-                    _id: item._id,
-                    product_id: bundleItem.product_id,
-                    price: item.price,
-                    num: item.num,
-                    discount_list: updatedDiscountList2
+                    );
+                    newBundleWithDiscount.push({
+                      ...bundleItem,
+                      _id: item._id,
+                      product_id: bundleItem.product_id,
+                      price: item.price,
+                      num: item.num,
+                      quantity: item.num,
+                      discount_list: updatedDiscountList2
+                    });
                   });
                 } else {
-                  newBundleWithDiscount.push(item);
+                  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
+                        };
+                      }
+                    );
+                    newBundleWithDiscount.push({
+                      ...bundleItem,
+                      _id: item._id,
+                      product_id: bundleItem.product_id,
+                      price: item.price,
+                      num: item.num,
+                      quantity: item.num,
+                      discount_list: updatedDiscountList2
+                    });
+                  } else {
+                    newBundleWithDiscount.push(item);
+                  }
                 }
               }
-            });
+            );
             let newTotalWithDiscount = Number(mainProductData.price || 0);
-            let newOriginTotalWithDiscount = Number(mainProductData.original_price || mainProductData.price || 0);
-            const updatedMainDiscountList = mainProductData.discount_list.map((discount) => {
-              var _a, _b;
-              if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
-                return discount;
-              }
-              return {
-                ...discount,
-                // num: 1,
-                metadata: {
-                  ...discount.metadata,
-                  custom_product_bundle_map_id: (_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.custom_product_bundle_map_id,
-                  num: 1
+            let newOriginTotalWithDiscount = Number(
+              mainProductData.original_price || mainProductData.price || 0
+            );
+            const updatedMainDiscountList = mainProductData.discount_list.map(
+              (discount) => {
+                var _a, _b;
+                if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
+                  return discount;
                 }
-              };
-            });
-            const mainDiscountList = updatedMainDiscountList.filter((item) => {
-              var _a;
-              return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
-            });
+                return {
+                  ...discount,
+                  // num: 1,
+                  metadata: {
+                    ...discount.metadata,
+                    custom_product_bundle_map_id: (_b = discount == null ? void 0 : discount.metadata) == null ? void 0 : _b.custom_product_bundle_map_id,
+                    num: 1
+                  }
+                };
+              }
+            );
+            const mainDiscountList = updatedMainDiscountList.filter(
+              (item) => {
+                var _a;
+                return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
+              }
+            );
             if (mainDiscountList && mainDiscountList.length > 0) {
               const allDiscountAmount = (0, import_utils.getDiscountListAmountTotal)(mainDiscountList);
               newTotalWithDiscount = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalWithDiscount;
@@ -1164,20 +1558,24 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
                 bundle: newBundleWithDiscount,
-                total: new import_decimal.default(newTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber(),
-                origin_total: new import_decimal.default(newOriginTotalWithDiscount).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber()
+                total: newTotalWithDiscount,
+                origin_total: newOriginTotalWithDiscount
               })
             );
             if (mainProductQuantity > 1) {
               const newBundleOriginal = [];
-              (product.bundle || []).forEach((bundleItem, bundleIndex) => {
-                newBundleOriginal.push({
-                  ...bundleItem,
-                  discount_list: []
-                });
-              });
+              (product.bundle || []).forEach(
+                (bundleItem, bundleIndex) => {
+                  newBundleOriginal.push({
+                    ...bundleItem,
+                    discount_list: []
+                  });
+                }
+              );
               let newTotalOriginal = Number(mainProductData.price || 0);
-              let newOriginTotalOriginal = Number(mainProductData.original_price || mainProductData.price || 0);
+              let newOriginTotalOriginal = Number(
+                mainProductData.original_price || mainProductData.price || 0
+              );
               const updatedMainDiscountListOriginal = mainProductData.discount_list.map((discount) => {
                 var _a, _b;
                 if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
@@ -1193,12 +1591,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   // num: mainProductQuantity - 1,
                 };
               });
-              const mainDiscountListOriginal = updatedMainDiscountListOriginal.filter((item) => {
-                var _a;
-                return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
-              });
+              const mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(
+                (item) => {
+                  var _a;
+                  return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
+                }
+              );
               if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
-                const allDiscountAmount = (0, import_utils.getDiscountListAmount)(mainDiscountListOriginal);
+                const allDiscountAmount = (0, import_utils.getDiscountListAmount)(
+                  mainDiscountListOriginal
+                );
                 newTotalOriginal = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalOriginal;
                 newOriginTotalOriginal = mainProductData.origin_total ?? newOriginTotalOriginal;
               }
@@ -1235,59 +1637,67 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               const mainProductData = this.hooks.getProduct(mainProduct);
               const newBundle = [];
               if (product.bundle && Array.isArray(product.bundle)) {
-                product.bundle.forEach((bundleItem, bundleIndex) => {
-                  const bundleItemId = `${product._id}_bundle_${bundleIndex}`;
-                  const processedBundleItems = processedFlatItemsMap2.get(bundleItemId);
-                  if (!processedBundleItems || processedBundleItems.length === 0) {
-                    newBundle.push(bundleItem);
-                  } else {
-                    processedBundleItems.forEach((item) => {
-                      const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
-                        var _a2;
-                        return {
-                          ...discount,
-                          metadata: {
-                            ...discount.metadata,
-                            num: item.num,
-                            custom_product_bundle_map_id: (_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
-                          }
-                          // num: item.num, // 使用拆分后的 num
-                        };
+                product.bundle.forEach(
+                  (bundleItem, bundleIndex) => {
+                    const bundleItemId = `${product._id}_bundle_${bundleIndex}`;
+                    const processedBundleItems = processedFlatItemsMap2.get(bundleItemId);
+                    if (!processedBundleItems || processedBundleItems.length === 0) {
+                      newBundle.push(bundleItem);
+                    } else {
+                      processedBundleItems.forEach((item) => {
+                        const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
+                          var _a2;
+                          return {
+                            ...discount,
+                            metadata: {
+                              ...discount.metadata,
+                              num: item.num,
+                              custom_product_bundle_map_id: (_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
+                            }
+                            // num: item.num, // 使用拆分后的 num
+                          };
+                        });
+                        newBundle.push({
+                          ...bundleItem,
+                          _id: item._id,
+                          product_id: bundleItem.product_id,
+                          price: item.price,
+                          num: item.num,
+                          quantity: item.num,
+                          discount_list: updatedDiscountList2
+                        });
                       });
-                      newBundle.push({
-                        ...bundleItem,
-                        _id: item._id,
-                        product_id: bundleItem.product_id,
-                        price: item.price,
-                        num: item.num,
-                        discount_list: updatedDiscountList2
-                      });
-                    });
+                    }
                   }
-                });
+                );
               }
               let newTotal = Number(mainProductData.price || 0);
-              let newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
-              const isManualDiscount = typeof mainProductData.isManualDiscount === "boolean" ? mainProductData.isManualDiscount : mainProductData.total != mainProductData.origin_total && (!((_a = mainProductData.discount_list) == null ? void 0 : _a.length) || ((_c = (_b = mainProductData == null ? void 0 : mainProductData.discount_list) == null ? void 0 : _b.every) == null ? void 0 : _c.call(_b, (item) => item.type === "product")));
+              let newOriginTotal = Number(
+                mainProductData.original_price || mainProductData.price || 0
+              );
+              const isManualDiscount = typeof mainProductData.isManualDiscount === "boolean" ? mainProductData.isManualDiscount : mainProductData.total != mainProductData.origin_total && (!((_a = mainProductData.discount_list) == null ? void 0 : _a.length) || ((_c = (_b = mainProductData == null ? void 0 : mainProductData.discount_list) == null ? void 0 : _b.every) == null ? void 0 : _c.call(
+                _b,
+                (item) => item.type === "product"
+              )));
               if (isManualDiscount) {
                 newTotal = mainProductData.total ?? newTotal;
                 newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
               } else {
-                const mainDiscountList = mainProductData.discount_list.filter((item) => {
-                  var _a2;
-                  return !((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-                });
+                const mainDiscountList = mainProductData.discount_list.filter(
+                  (item) => {
+                    var _a2;
+                    return !((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+                  }
+                );
                 if (mainDiscountList && mainDiscountList.length > 0) {
                   const allDiscountAmount = (0, import_utils.getDiscountListAmount)(mainDiscountList);
                   newTotal = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotal;
                   newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
                 }
                 if (newBundle.length > 0) {
-                  newBundle.forEach((item) => {
-                    newTotal += Number(item.price) * Number(item.num);
-                  });
                   newBundle.forEach((item) => {
                     var _a2, _b2, _c2;
+                    newTotal += Number(item.price) * Number(item.num);
                     const originalPrice = ((_c2 = (_b2 = (_a2 = item.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) || item.price;
                     newOriginTotal += Number(originalPrice) * Number(item.num);
                   });
@@ -1300,8 +1710,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   return accumulator.add(currentPrice.mul(currentNum));
                 }, new import_decimal.default(newTotal)).toNumber();
               }
-              newTotal = new import_decimal.default(newTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
-              newOriginTotal = new import_decimal.default(newOriginTotal).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
               result.push(
                 this.hooks.setProduct(mainProduct, {
                   ...mainProductData,