@pisell/pisellos 2.1.60 → 2.1.62

package/lib/modules/Rules/index.js

@@ -49,7 +49,6 @@ 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;
@@ -58,10 +57,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   getRulesList() {
     return this.store.rulesList;
   }
-  getWalletPassEvaluator() {
-    var _a, _b;
-    return (_b = (_a = this.window).getWalletPassEvaluator) == null ? void 0 : _b.call(_a);
-  }
   // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
   checkHolderMatch(discount, product, holders) {
     var _a;
@@ -81,7 +76,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     newDiscountList,
     productList,
     holders,
-    orderTotalAmount,
     isFormSubject
   }) {
     if (!newDiscountList || newDiscountList.length === 0) {
@@ -102,18 +96,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
-    const filteredOldDiscountList = oldDiscountList.filter(
-      (discount) => !discount.isEditMode && discount.tag !== "good_pass"
-    );
-    const mergedDiscountList = (0, import_utils.uniqueById)(
-      (0, import_utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]),
-      "product_id"
-    );
+    const filteredOldDiscountList = oldDiscountList.filter((discount) => !discount.isEditMode && discount.tag !== "good_pass");
+    const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
+      ...filteredOldDiscountList,
+      ...newDiscountList
+    ]), "product_id");
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList],
       holders,
-      orderTotalAmount,
       isFormSubject
     }, {
       scan: true
@@ -148,7 +139,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList,
     holders,
-    orderTotalAmount,
     isFormSubject
   }, options) {
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
@@ -251,8 +241,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const flattenedList = flattenProductsWithBundle(productList);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
       var _a, _b;
-      const priceA = new import_decimal.default(a.price || "0");
-      const priceB = new import_decimal.default(b.price || "0");
+      const priceA = new import_decimal.default(
+        a.type === "bundle" ? a.original_price ?? a.price ?? "0" : a.price || "0"
+      );
+      const priceB = new import_decimal.default(
+        b.type === "bundle" ? b.original_price ?? b.price ?? "0" : b.price || "0"
+      );
       if (priceA.equals(priceB)) {
         if (a.type !== b.type) {
           return a.type === "main" ? -1 : 1;
@@ -269,50 +263,7 @@ 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 discountApplicability = /* @__PURE__ */ new Map();
     const discountApplicableProducts = /* @__PURE__ */ new Map();
     addModeDiscount.forEach((discount) => {
@@ -341,7 +292,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         originProduct = flatItem.originProduct;
       }
       addModeDiscount.forEach((discount) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         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(
@@ -354,17 +305,11 @@ 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.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) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every(
-          (discount2) => discount2.id && [
-            "good_pass",
-            "discount_card",
-            "product_discount_card"
-          ].includes(discount2.tag || discount2.type)
-        ))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
+        const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
+        const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && ((_e = discount.config) == null ? void 0 : _e.isAvailable)) {
-          (_f = discountApplicability.get(discount.id)) == null ? void 0 : _f.push(product.id);
+        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+          (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
           const isGoodPass = discountType === "good_pass";
@@ -374,14 +319,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
-              discount_card_type: (_g = discount == null ? void 0 : discount.metadata) == null ? void 0 : _g.discount_card_type,
+              discount_card_type: (_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.discount_card_type,
               fixed_amount: product.price,
               resource_id: discount.id,
               title: discount.format_title,
               original_amount: product.price || product.origin_total,
               pre_value: discount.par_value,
-              product_id: originProduct.id,
-              discount_product_id: discount.product_id
+              product_id: originProduct.id
             },
             metadata: {
               num
@@ -414,39 +358,22 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
-      if ((product == null ? void 0 : product.booking_id) && ((_d = product.discount_list) == null ? void 0 : _d.length) && ((_e = product == null ? void 0 : product.discount_list) == null ? void 0 : _e.every(
-        (discount) => discount.id && ["good_pass", "discount_card", "product_discount_card"].includes(
-          discount.tag || discount.type
-        )
-      ))) {
+      if ((product == null ? void 0 : product.booking_id) && ((_d = product.discount_list) == null ? void 0 : _d.length) && ((_e = product == null ? void 0 : product.discount_list) == null ? void 0 : _e.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, _c2, _d2;
-        const discountType = discount.tag || discount.type;
-        if (["good_pass", "discount_card", "product_discount_card"].includes(
-          discountType
-        )) {
-          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.find((n) => {
-          var _a3;
-          return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
-        })) && (discount.tag || discount.type) === "good_pass")
+        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")
           return false;
-        if ((Number(product.price) <= 0 || !product.price) && !((_c2 = product.discount_list) == null ? void 0 : _c2.find((n) => {
+        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -454,15 +381,6 @@ 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 limitedData = 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(
@@ -481,9 +399,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           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;
           }
@@ -496,96 +411,66 @@ 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") {
-        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);
-          }
-        ) && (!((_f = product.discount_list) == null ? void 0 : _f.length) || ((_h = (_g = product == null ? void 0 : product.discount_list) == null ? void 0 : _g.every) == null ? void 0 : _h.call(
-          _g,
-          (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);
+        }) && (!((_f = product.discount_list) == null ? void 0 : _f.length) || ((_h = (_g = product == null ? void 0 : product.discount_list) == null ? void 0 : _g.every) == null ? void 0 : _h.call(_g, (item) => item.type === "product")));
       } 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);
-            }
-          ) && (!((_i = parentProduct.discount_list) == null ? void 0 : _i.length) || ((_k = (_j = parentProduct == null ? void 0 : parentProduct.discount_list) == null ? void 0 : _j.every) == null ? void 0 : _k.call(
-            _j,
-            (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);
+          }) && (!((_i = parentProduct.discount_list) == null ? void 0 : _i.length) || ((_k = (_j = parentProduct == null ? void 0 : parentProduct.discount_list) == null ? void 0 : _j.every) == null ? void 0 : _k.call(_j, (item) => item.type === "product")));
         }
       }
       if (options == null ? void 0 : options.discountId) {
-        if (flatItem.type === "main" && ((_l = product.discount_list) == null ? void 0 : _l.some(
-          (item) => {
-            var _a2;
-            return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
-          }
-        ))) {
+        if (flatItem.type === "main" && ((_l = product.discount_list) == null ? void 0 : _l.some((item) => {
+          var _a2;
+          return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
+        }))) {
           isManualDiscount = false;
         }
         if (flatItem.type === "bundle") {
-          if (((_m = product.discount_list) == null ? void 0 : _m.some(
-            (item) => {
-              var _a2;
-              return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
-            }
-          )) || ((_o = (_n = flatItem.parentProduct) == null ? void 0 : _n.discount_list) == null ? void 0 : _o.some(
-            (item) => {
-              var _a2;
-              return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
-            }
-          ))) {
+          if (((_m = product.discount_list) == null ? void 0 : _m.some((item) => {
+            var _a2;
+            return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
+          })) || ((_o = (_n = flatItem.parentProduct) == null ? void 0 : _n.discount_list) == null ? void 0 : _o.some((item) => {
+            var _a2;
+            return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
+          }))) {
             isManualDiscount = false;
           }
         }
       }
       if (options == null ? void 0 : options.selectedList) {
-        if (flatItem.type === "main" && ((_p = product.discount_list) == null ? void 0 : _p.some(
-          (item) => {
-            var _a2;
-            return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some(
-              (n) => {
-                var _a3;
-                return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
-              }
-            );
-          }
-        ))) {
+        if (flatItem.type === "main" && ((_p = product.discount_list) == null ? void 0 : _p.some((item) => {
+          var _a2;
+          return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some((n) => {
+            var _a3;
+            return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
+          });
+        }))) {
           isManualDiscount = false;
         }
         if (flatItem.type === "bundle") {
-          if (((_q = product.discount_list) == null ? void 0 : _q.some(
-            (item) => {
-              var _a2;
-              return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some(
-                (n) => {
-                  var _a3;
-                  return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
-                }
-              );
-            }
-          )) || ((_s = (_r = flatItem.parentProduct) == null ? void 0 : _r.discount_list) == null ? void 0 : _s.some(
-            (item) => {
-              var _a2;
-              return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some(
-                (n) => {
-                  var _a3;
-                  return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
-                }
-              );
-            }
-          ))) {
+          if (((_q = product.discount_list) == null ? void 0 : _q.some((item) => {
+            var _a2;
+            return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some((n) => {
+              var _a3;
+              return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
+            });
+          })) || ((_s = (_r = flatItem.parentProduct) == null ? void 0 : _r.discount_list) == null ? void 0 : _s.some((item) => {
+            var _a2;
+            return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some((n) => {
+              var _a3;
+              return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
+            });
+          }))) {
             isManualDiscount = false;
           }
         }
@@ -593,8 +478,9 @@ 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") {
           if (product.isClient) {
-            processedProductsMap.set(product._id, [
-              this.hooks.setProduct(originProduct, {
+            processedProductsMap.set(
+              product._id,
+              [this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {} : {
                   origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                     product: {
@@ -615,11 +501,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price
                 },
                 discount_list: []
-              })
-            ]);
+              })]
+            );
           } else {
-            processedProductsMap.set(product._id, [
-              this.hooks.setProduct(originProduct, {
+            processedProductsMap.set(
+              product._id,
+              [this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
                   price: product.price,
                   main_product_selling_price: product.price
@@ -630,8 +517,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price: product.price
                 },
                 discount_list: []
-              })
-            ]);
+              })]
+            );
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
@@ -648,36 +535,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       const isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === "good_pass";
       const totalQuantity = product.quantity || product.num || 1;
-      const availableGoodPassCount = applicableDiscounts.filter(
-        (item) => (item.tag || item.type) === "good_pass"
-      ).length;
-      let maxUsageLimit = availableGoodPassCount;
-      if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
-        maxUsageLimit = Math.min(
-          availableGoodPassCount,
-          selectedDiscount.config.maxUsagePerOrder
-        );
-      }
-      const splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, maxUsageLimit) : 1;
+      const availableGoodPassCount = applicableDiscounts.filter((item) => (item.tag || item.type) === "good_pass").length;
+      const splitCount = isNeedSplit ? Math.min(totalQuantity, availableGoodPassCount) : 1;
       const arr = [];
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
-          arr.push(
-            this.hooks.setProduct(originProduct, {
-              discount_list: [],
-              quantity: totalQuantity - splitCount,
-              _id: product._id.split("___")[0],
-              total: product.origin_total || product.total
-            })
-          );
+          arr.push(this.hooks.setProduct(originProduct, {
+            discount_list: [],
+            quantity: totalQuantity - splitCount,
+            _id: product._id.split("___")[0]
+          }));
         }
         for (let i = 0; i < splitCount; i++) {
           const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i];
           usedDiscounts.set(selectedDiscount2.id, true);
-          if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
-            const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;
-            usedProductIdCounts.set(selectedDiscount2.product_id, currentCount + 1);
-          }
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           let productOriginTotal = product.origin_total || product.total || 0;
           if (((_t = product.discount_list) == null ? void 0 : _t.length) && product.origin_total) {
@@ -686,30 +557,24 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (Number(((_u = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _u.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
-          const targetProductTotal = (0, import_utils.getDiscountAmount)(
-            selectedDiscount2,
-            product.price,
-            product.price
-          );
-          const discountType = selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag;
-          const actualDiscountAmount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+          const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
+          const discountType = selectedDiscount2.tag || selectedDiscount2.type;
           const isGoodPass = discountType === "good_pass";
+          const amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
           const discountDetail = {
-            amount: actualDiscountAmount,
-            type: discountType,
+            amount,
+            type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
               discount_card_type: (_v = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _v.discount_card_type,
-              fixed_amount: actualDiscountAmount,
+              fixed_amount: amount,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
               product_id: originProduct.id,
-              percent: selectedDiscount2.par_value,
-              discount_product_id: selectedDiscount2.product_id
+              percent: selectedDiscount2.par_value
             },
             // 前端使用的num数量，为了计算优惠金额
             _num: isGoodPass ? 1 : product.num,
-            config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
             metadata: {
               num: 1
             }
@@ -725,6 +590,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }, new import_decimal.default(total)).toNumber();
           }
           if (product.isClient) {
+            debugger;
             arr.push(this.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
               price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
@@ -761,35 +627,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           for (let i = 0; i < discountNum; i++) {
             const selectedDiscount2 = applicableDiscounts[i];
             usedDiscounts.set(selectedDiscount2.id, true);
-            if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
-              const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;
-              usedProductIdCounts.set(selectedDiscount2.product_id, currentCount + 1);
-            }
             const uniqueId = `${flatItem._id}_split_${i}`;
-            const discountedPrice = (0, import_utils.getDiscountAmount)(
-              selectedDiscount2,
-              product.origin_total,
-              product.origin_total
-            );
-            const bundleDiscountAmount = new import_decimal.default(product.origin_total || 0).minus(discountedPrice).toNumber();
             const discountDetail = {
-              amount: bundleDiscountAmount,
+              amount: product.origin_total,
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
-                product_id: product.id,
-                discount_product_id: selectedDiscount2.product_id
+                product_id: product.id
               },
               metadata: {
                 // 🔥 使用拆分后的唯一 _id
                 custom_product_bundle_map_id: uniqueId,
                 num: 1
               },
-              _num: 1,
-              config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config
+              _num: 1
             };
             const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
             appliedProducts.push(discountDetail);
@@ -800,9 +654,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               _id: uniqueId,
               num: 1,
               quantity: 1,
-              price: discountedPrice,
-              // 折扣后的价格
-              total: discountedPrice,
+              price: 0,
+              // 商品券价格为0
+              total: 0,
               discount_list: [discountDetail],
               processed: true,
               _discountId: selectedDiscount2.id
@@ -822,37 +676,30 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         } else {
           const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[0];
           usedDiscounts.set(selectedDiscount2.id, true);
-          if ((selectedDiscount2.tag || selectedDiscount2.type) === "good_pass") {
-            const currentCount = usedProductIdCounts.get(selectedDiscount2.product_id) || 0;
-            usedProductIdCounts.set(selectedDiscount2.product_id, currentCount + 1);
-          }
           const productOriginTotal = product.original_price || product.price || 0;
           const targetProductTotal = (0, import_utils.getDiscountAmount)(
             selectedDiscount2,
             productOriginTotal,
             productOriginTotal
           );
-          const bundleActualDiscountAmount = new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber();
           const uniqueId = flatItem._id;
           const discountDetail = {
-            amount: bundleActualDiscountAmount * (product.num || 1),
+            amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber() * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
               discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
-              fixed_amount: bundleActualDiscountAmount,
+              fixed_amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber(),
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
               product_id: product.id,
-              percent: selectedDiscount2.par_value,
-              discount_product_id: selectedDiscount2.product_id
+              percent: selectedDiscount2.par_value
             },
             metadata: {
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
               num: product.num || 1
             },
-            config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
             _num: (product.num || 1) * (((_x = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _x.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
@@ -942,65 +789,59 @@ 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: {
-                          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
-                    });
+            (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: {
+                        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: {
+                        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: {
-                          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 {
-                    newBundleWithDiscount.push(item);
-                  }
+                  newBundleWithDiscount.push(item);
                 }
               }
-            );
+            });
             let newTotalWithDiscount = Number(mainProductData.price || 0);
-            let newOriginTotalWithDiscount = Number(
-              mainProductData.original_price || 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) {
@@ -1015,12 +856,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 }
               };
             });
-            const mainDiscountList = updatedMainDiscountList.filter(
-              (item) => {
-                var _a;
-                return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
-              }
-            );
+            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;
@@ -1056,18 +895,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             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) {
@@ -1082,16 +917,12 @@ 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;
               }
@@ -1126,56 +957,47 @@ 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: {
-                              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,
-                          discount_list: updatedDiscountList2
-                        });
+                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: {
+                            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,
+                        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;