@pisell/pisellos 2.2.243 → 2.2.244

package/lib/modules/Rules/index.js

@@ -159,14 +159,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   filterDiscountListByType(discountList, type) {
     return (discountList || []).filter((item) => item.type === type || item.tag === type);
   }
-  /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-  excludeDiscountListByType(discountList, type) {
-    return (discountList || []).filter((item) => item.type !== type && item.tag !== type);
-  }
-  /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-  resolveDiscountListForManualOverride(discountList) {
-    return this.excludeDiscountListByType(discountList, "promotion");
-  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -206,7 +198,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     isFormSubject,
     orderTotalAmount
   }, options) {
-    var _a;
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
@@ -219,8 +210,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const editModeOrderLevelProductIds = /* @__PURE__ */ new Set();
     editModeDiscount.forEach((discount) => {
-      var _a2, _b;
-      if (((_a2 = discount.discount) == null ? void 0 : _a2.discount_calculation_mode) === "order_level") {
+      var _a, _b;
+      if (((_a = discount.discount) == null ? void 0 : _a.discount_calculation_mode) === "order_level") {
         editModeOrderLevelProductIds.add((_b = discount == null ? void 0 : discount.discount) == null ? void 0 : _b.discount_product_id);
       }
     });
@@ -234,13 +225,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const filteredDiscountList = addModeDiscount.filter((discount) => {
       return !discount.isManualSelect;
     });
-    const hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options == null ? void 0 : options.discountId) || Boolean((_a = options == null ? void 0 : options.selectedList) == null ? void 0 : _a.length) || Boolean(options == null ? void 0 : options.scan);
-    if (!hasDiscountInput) {
-      return {
-        discountList,
-        productList
-      };
-    }
     const flattenProductsWithBundle = (productList2) => {
       const flattened = [];
       productList2.forEach((originProduct) => {
@@ -286,17 +270,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     };
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
       const isHolderDiscount = (discount) => {
-        var _a2, _b;
-        return ((_b = (_a2 = discount.metadata) == null ? void 0 : _a2.holder) == null ? void 0 : _b.type) === "custom";
+        var _a, _b;
+        return ((_b = (_a = discount.metadata) == null ? void 0 : _a.holder) == null ? void 0 : _b.type) === "custom";
       };
       const isGoodPass = (discount) => discount.tag === "good_pass";
       const isOrderLevelDiscount = (discount) => {
-        var _a2;
-        return discount.tag === "product_discount_card" && ((_a2 = discount.metadata) == null ? void 0 : _a2.discount_calculation_mode) === "order_level";
+        var _a;
+        return discount.tag === "product_discount_card" && ((_a = discount.metadata) == null ? void 0 : _a.discount_calculation_mode) === "order_level";
       };
       const isItemLevelDiscount = (discount) => {
-        var _a2;
-        return discount.tag === "product_discount_card" && ((_a2 = discount.metadata) == null ? void 0 : _a2.discount_calculation_mode) !== "order_level";
+        var _a;
+        return discount.tag === "product_discount_card" && ((_a = discount.metadata) == null ? void 0 : _a.discount_calculation_mode) !== "order_level";
       };
       const getPriority = (discount) => {
         const isHolder = isHolderDiscount(discount);
@@ -326,8 +310,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
       }
       function compareDiscountCardValue(itemA, itemB) {
-        var _a2, _b;
-        const typeA = ((_a2 = itemA.metadata) == null ? void 0 : _a2.discount_card_type) || "percent";
+        var _a, _b;
+        const typeA = ((_a = itemA.metadata) == null ? void 0 : _a.discount_card_type) || "percent";
         const typeB = ((_b = itemB.metadata) == null ? void 0 : _b.discount_card_type) || "percent";
         if (typeA === "fixed_amount" && typeB === "percent")
           return -1;
@@ -367,7 +351,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const flattenedList = flattenProductsWithBundle(productList);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
-      var _a2, _b;
+      var _a, _b;
       const priceA = new import_decimal.default(
         a.type === "bundle" ? a.original_price ?? a.price ?? "0" : a.price || "0"
       );
@@ -380,7 +364,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         if (a.type === "main" && b.type === "main") {
           if (a.product.quantity === b.product.quantity) {
-            return (((_a2 = b.product.discount_list) == null ? void 0 : _a2.length) || 0) - (((_b = a.product.discount_list) == null ? void 0 : _b.length) || 0);
+            return (((_a = b.product.discount_list) == null ? void 0 : _a.length) || 0) - (((_b = a.product.discount_list) == null ? void 0 : _b.length) || 0);
           }
           return a.product.quantity - b.product.quantity;
         }
@@ -393,7 +377,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const evaluator = this.getWalletPassEvaluator();
     if (evaluator) {
       addModeDiscount.forEach((discount) => {
-        var _a2, _b;
+        var _a, _b;
         const discountType = discount.tag || discount.type;
         if (["good_pass", "discount_card", "product_discount_card"].includes(
           discountType
@@ -405,17 +389,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             product_id: discount.product_id,
             unified_available_status: 1,
-            available_product_type: (_a2 = discount.limited_relation_product_data) == null ? void 0 : _a2.type,
+            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) => {
-            var _a3;
+            var _a2;
             return {
               product_id: item.id,
               price: item.price || 0,
               quantity: item.quantity || item.num || 1,
               selling_price: item.price || 0,
-              product_options: item.type === "main" ? (_a3 = item.product) == null ? void 0 : _a3.options : void 0
+              product_options: item.type === "main" ? (_a2 = item.product) == null ? void 0 : _a2.options : void 0
             };
           });
           const result = evaluator.checkVoucherAvailability({
@@ -448,7 +432,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const orderLevelDiscountApplicableItems = /* @__PURE__ */ new Map();
     const itemApplicableDiscounts = /* @__PURE__ */ new Map();
     const checkItemApplicableForDiscount = (flatItem, discount) => {
-      var _a2, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       let product;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -461,7 +445,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           num: flatItem.num,
           booking_id: flatItem.booking_id,
           discount_list: flatItem.discount_list || [],
-          startDate: (_a2 = flatItem.parentProduct) == null ? void 0 : _a2.startDate
+          startDate: (_a = flatItem.parentProduct) == null ? void 0 : _a.startDate
         };
       }
       const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.length) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.every((d) => d.id && ["good_pass", "discount_card", "product_discount_card"].includes(d.tag || d.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && !!((_e = (_d = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _d.discount_list) == null ? void 0 : _e.length) && ((_g = (_f = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _f.discount_list) == null ? void 0 : _g.every((d) => d.id)));
@@ -523,13 +507,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       }
     });
+    console.log("occupiedItems", occupiedItems, "orderLevelDiscountApplicableItems", orderLevelDiscountApplicableItems);
     sortedDiscountList.forEach((discount) => {
       if (!(0, import_utils3.isOrderLevelFixedAmountDiscount)(discount)) {
         return;
       }
       const applicableProducts = [];
       sortedFlattenedList.forEach((flatItem) => {
-        var _a2, _b, _c;
+        var _a, _b, _c;
         const occupyingDiscountId = occupiedItems.get(flatItem._id);
         if (occupyingDiscountId !== void 0 && occupyingDiscountId !== discount.id) {
           return;
@@ -549,7 +534,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             num: flatItem.num
           };
         }
-        const quantity = flatItem.type === "main" ? product.num || product.quantity || 1 : (product.num || product.quantity || 1) * (((_a2 = flatItem.parentProduct) == null ? void 0 : _a2.num) || ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1);
+        const quantity = flatItem.type === "main" ? product.num || product.quantity || 1 : (product.num || product.quantity || 1) * (((_a = flatItem.parentProduct) == null ? void 0 : _a.num) || ((_b = flatItem.parentProduct) == null ? void 0 : _b.quantity) || 1);
         const originalAmount = flatItem.type === "main" ? Number(product.price ?? 0) : Number(flatItem.original_price ?? flatItem.price ?? 0);
         const productData = {
           productId: flatItem._id,
@@ -569,7 +554,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const processedProductsMap = /* @__PURE__ */ new Map();
     const appliedDiscountProducts = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem) => {
-      var _a2;
+      var _a;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -585,12 +570,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           origin_total: flatItem.origin_total,
           booking_id: flatItem.booking_id,
           discount_list: flatItem.discount_list || [],
-          startDate: (_a2 = flatItem.parentProduct) == null ? void 0 : _a2.startDate
+          startDate: (_a = flatItem.parentProduct) == null ? void 0 : _a.startDate
         };
         originProduct = flatItem.originProduct;
       }
       addModeDiscount.forEach((discount) => {
-        var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+        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(
@@ -604,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.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) && ((_a3 = product == null ? void 0 : product.discount_list) == null ? void 0 : _a3.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every(
+        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",
             "discount_card",
@@ -688,7 +673,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }, 0);
     };
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a2, _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;
+      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;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -701,7 +686,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           quantity: flatItem.quantity,
           num: flatItem.num,
           total: flatItem.total,
-          original_price: (_a2 = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _a2.original_price,
+          original_price: (_a = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _a.original_price,
           origin_total: (_b = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _b.original_price,
           booking_id: flatItem.booking_id,
           discount_list: ((_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.discount_list) || [],
@@ -709,18 +694,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
         originProduct = flatItem.originProduct;
       }
-      const isPersistedProduct = (product == null ? void 0 : product.booking_id) || (originProduct == null ? void 0 : originProduct.order_detail_id) || (originProduct == null ? void 0 : originProduct.orderDetailId) || (originProduct == null ? void 0 : originProduct.booking_id);
-      const hasExistingWalletDiscount = ((_e = product.discount_list) == null ? void 0 : _e.length) && ((_f = product == null ? void 0 : product.discount_list) == null ? void 0 : _f.every((discount) => {
-        var _a3;
-        const discountIdentity = discount.id ?? ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id);
-        const discountType = discount.tag || discount.type;
-        return Boolean(
-          discountIdentity && ["good_pass", "discount_card", "product_discount_card"].includes(
-            discountType
-          )
-        );
-      }));
-      if (isPersistedProduct && hasExistingWalletDiscount) {
+      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 {
@@ -734,20 +712,20 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        var _a3, _b2, _c2, _d2;
+        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 || !((_a3 = discount == null ? void 0 : discount.config) == null ? void 0 : _a3.isAvailable)) {
+          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) && !((_c2 = product.discount_list) == null ? void 0 : _c2.find((n) => {
-          var _a4;
-          return ((_a4 = n.discount) == null ? void 0 : _a4.resource_id) === discount.id;
+          var _a3;
+          return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
           return false;
         const targetUsedDiscounts = usedDiscounts.get(discount.id);
@@ -801,13 +779,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = false;
       if (flatItem.type === "main") {
-        isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : ((_g = product.discount_list) == null ? void 0 : _g.some((item) => item.type === "product")) || product.total != product.origin_total && (product.bundle || []).every(
+        isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(
           (item) => {
-            var _a3;
-            return !((_a3 = item.discount_list || []) == null ? void 0 : _a3.length);
+            var _a2;
+            return !((_a2 = item.discount_list || []) == null ? void 0 : _a2.length);
           }
-        ) && (!((_h = product.discount_list) == null ? void 0 : _h.length) || ((_j = (_i = product == null ? void 0 : product.discount_list) == null ? void 0 : _i.every) == null ? void 0 : _j.call(
-          _i,
+        ) && (!((_g = product.discount_list) == null ? void 0 : _g.length) || ((_i = (_h = product == null ? void 0 : product.discount_list) == null ? void 0 : _h.every) == null ? void 0 : _i.call(
+          _h,
           (item) => item.type === "product"
         )));
         if (product.inPromotion) {
@@ -816,36 +794,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       } else {
         const parentProduct = flatItem.parentProduct;
         if (parentProduct) {
-          isManualDiscount = typeof parentProduct.isManualDiscount === "boolean" ? parentProduct.isManualDiscount : ((_k = parentProduct.discount_list) == null ? void 0 : _k.some((item) => item.type === "product")) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(
+          isManualDiscount = typeof parentProduct.isManualDiscount === "boolean" ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(
             (item) => {
-              var _a3;
-              return !((_a3 = item.discount_list || []) == null ? void 0 : _a3.length);
+              var _a2;
+              return !((_a2 = item.discount_list || []) == null ? void 0 : _a2.length);
             }
-          ) && (!((_l = parentProduct.discount_list) == null ? void 0 : _l.length) || ((_n = (_m = parentProduct == null ? void 0 : parentProduct.discount_list) == null ? void 0 : _m.every) == null ? void 0 : _n.call(
-            _m,
+          ) && (!((_j = parentProduct.discount_list) == null ? void 0 : _j.length) || ((_l = (_k = parentProduct == null ? void 0 : parentProduct.discount_list) == null ? void 0 : _k.every) == null ? void 0 : _l.call(
+            _k,
             (item) => item.type === "product"
           )));
         }
       }
       if (options == null ? void 0 : options.discountId) {
-        if (flatItem.type === "main" && ((_o = product.discount_list) == null ? void 0 : _o.some(
+        if (flatItem.type === "main" && ((_m = product.discount_list) == null ? void 0 : _m.some(
           (item) => {
-            var _a3;
-            return ((_a3 = item.discount) == null ? void 0 : _a3.resource_id) === options.discountId;
+            var _a2;
+            return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
           }
         ))) {
           isManualDiscount = false;
         }
         if (flatItem.type === "bundle") {
-          if (((_p = product.discount_list) == null ? void 0 : _p.some(
+          if (((_n = product.discount_list) == null ? void 0 : _n.some(
             (item) => {
-              var _a3;
-              return ((_a3 = item.discount) == null ? void 0 : _a3.resource_id) === options.discountId;
+              var _a2;
+              return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
             }
-          )) || ((_r = (_q = flatItem.parentProduct) == null ? void 0 : _q.discount_list) == null ? void 0 : _r.some(
+          )) || ((_p = (_o = flatItem.parentProduct) == null ? void 0 : _o.discount_list) == null ? void 0 : _p.some(
             (item) => {
-              var _a3;
-              return ((_a3 = item.discount) == null ? void 0 : _a3.resource_id) === options.discountId;
+              var _a2;
+              return ((_a2 = item.discount) == null ? void 0 : _a2.resource_id) === options.discountId;
             }
           ))) {
             isManualDiscount = false;
@@ -853,13 +831,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       }
       if (options == null ? void 0 : options.selectedList) {
-        if (flatItem.type === "main" && ((_s = product.discount_list) == null ? void 0 : _s.some(
+        if (flatItem.type === "main" && ((_q = product.discount_list) == null ? void 0 : _q.some(
           (item) => {
-            var _a3;
-            return (_a3 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a3.some(
+            var _a2;
+            return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some(
               (n) => {
-                var _a4;
-                return n.discountId === ((_a4 = item.discount) == null ? void 0 : _a4.resource_id);
+                var _a3;
+                return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
               }
             );
           }
@@ -867,23 +845,23 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           isManualDiscount = false;
         }
         if (flatItem.type === "bundle") {
-          if (((_t = product.discount_list) == null ? void 0 : _t.some(
+          if (((_r = product.discount_list) == null ? void 0 : _r.some(
             (item) => {
-              var _a3;
-              return (_a3 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a3.some(
+              var _a2;
+              return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some(
                 (n) => {
-                  var _a4;
-                  return n.discountId === ((_a4 = item.discount) == null ? void 0 : _a4.resource_id);
+                  var _a3;
+                  return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
                 }
               );
             }
-          )) || ((_v = (_u = flatItem.parentProduct) == null ? void 0 : _u.discount_list) == null ? void 0 : _v.some(
+          )) || ((_t = (_s = flatItem.parentProduct) == null ? void 0 : _s.discount_list) == null ? void 0 : _t.some(
             (item) => {
-              var _a3;
-              return (_a3 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a3.some(
+              var _a2;
+              return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some(
                 (n) => {
-                  var _a4;
-                  return n.discountId === ((_a4 = item.discount) == null ? void 0 : _a4.resource_id);
+                  var _a3;
+                  return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
                 }
               );
             }
@@ -918,11 +896,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   price: product.price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           } else {
-            let total = product.inPromotion ? ((_w = product == null ? void 0 : product._promotion) == null ? void 0 : _w.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
+            let total = product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
             let main_product_selling_price = product.price;
             if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
               total = product.total ?? product.origin_total;
@@ -940,14 +918,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price,
                   options: restoredOptions
                 },
-                discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(product.discount_list) : this.filterDiscountListByType(product.discount_list, "promotion")
+                discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
             ]);
           }
         } else {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
-            discount_list: isManualDiscount ? this.resolveDiscountListForManualOverride(((_x = flatItem.bundleItem) == null ? void 0 : _x.discount_list) || []) : this.filterDiscountListByType(((_y = flatItem.bundleItem) == null ? void 0 : _y.discount_list) || [], "promotion"),
+            discount_list: this.filterDiscountListByType(((_v = flatItem.bundleItem) == null ? void 0 : _v.discount_list) || [], "promotion"),
             price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
@@ -998,13 +976,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           if (this.filterDiscountListByType(product.discount_list, "promotion").length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_z = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _z.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_w = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _w.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          const isDeductOptionPrice = !!((_A = selectedDiscount2.config) == null ? void 0 : _A.deductOptionPrice);
+          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
           let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
@@ -1022,7 +1000,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
             amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
           }
-          if (isDeductOptionPrice && ((_B = product.options) == null ? void 0 : _B.length)) {
+          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
             const optionResult = applyDiscountToOptions(
               product.options,
               selectedDiscount2
@@ -1030,7 +1008,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discountedOptions = optionResult.discountedOptions;
             optionDiscountAmount = optionResult.optionDiscountAmount;
           }
-          const optionsForLineTotal = isDeductOptionPrice && ((_C = product.options) == null ? void 0 : _C.length) ? discountedOptions : product.options;
+          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
           const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
           const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
           const mainProductDiscountAmount = amount;
@@ -1041,9 +1019,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
               fixed_amount: lineDiscountAmount,
-              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -1125,7 +1103,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_F = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _F.discount_calculation_mode,
+                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1199,9 +1177,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_G = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _G.discount_card_type,
+              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_H = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _H.discount_calculation_mode,
+              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1217,7 +1195,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_I = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _I.num) || 1)
+            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -1292,8 +1270,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 bundleProcessingInfo.set(bundleIndex, processedBundleItems);
                 const hasGoodPass = processedBundleItems.some(
                   (item) => {
-                    var _a2;
-                    return (_a2 = item.discount_list) == null ? void 0 : _a2.some(
+                    var _a;
+                    return (_a = item.discount_list) == null ? void 0 : _a.some(
                       (discount) => discount.type === "good_pass" || discount.tag === "good_pass"
                     );
                   }
@@ -1317,13 +1295,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 if (processedItems.length > 1) {
                   processedItems.forEach((item) => {
                     const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
-                      var _a2;
+                      var _a;
                       return {
                         ...discount,
                         metadata: {
                           ...discount.metadata,
                           num: item.num,
-                          custom_product_bundle_map_id: (_a2 = item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
                         }
                         // num: item.num, // 使用拆分后的 num
                       };
@@ -1341,13 +1319,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   const item = processedItems[0];
                   if (item.processed) {
                     const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
-                      var _a2;
+                      var _a;
                       return {
                         ...discount,
                         metadata: {
                           ...discount.metadata,
                           num: item.num,
-                          custom_product_bundle_map_id: (_a2 = item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_a = item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id
                         }
                         // num: item.num, // 使用当前的 num
                       };
@@ -1371,8 +1349,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               mainProductData.original_price || mainProductData.price || 0
             );
             const updatedMainDiscountList = mainProductData.discount_list.map((discount) => {
-              var _a2, _b;
-              if ((_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id) {
+              var _a, _b;
+              if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
                 return discount;
               }
               return {
@@ -1387,8 +1365,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             });
             const mainDiscountList = updatedMainDiscountList.filter(
               (item) => {
-                var _a2;
-                return !((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+                var _a;
+                return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
               }
             );
             if (mainDiscountList && mainDiscountList.length > 0) {
@@ -1401,8 +1379,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 newTotalWithDiscount += Number(item.price) * Number(item.num);
               });
               newBundleWithDiscount.forEach((item) => {
-                var _a2, _b, _c;
-                const originalPrice = ((_c = (_b = (_a2 = item.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
+                var _a, _b, _c;
+                const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
                 newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
               });
             }
@@ -1439,8 +1417,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 mainProductData.original_price || mainProductData.price || 0
               );
               const updatedMainDiscountListOriginal = mainProductData.discount_list.map((discount) => {
-                var _a2, _b;
-                if ((_a2 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id) {
+                var _a, _b;
+                if ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.custom_product_bundle_map_id) {
                   return discount;
                 }
                 return {
@@ -1455,8 +1433,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               });
               const mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(
                 (item) => {
-                  var _a2;
-                  return !((_a2 = item == null ? void 0 : item.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+                  var _a;
+                  return !((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.custom_product_bundle_map_id);
                 }
               );
               if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
@@ -1495,7 +1473,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }
           } else {
             mainProductArr.forEach((mainProduct) => {
-              var _a2, _b, _c;
+              var _a, _b, _c;
               const mainProductData = this.hooks.getProduct(mainProduct);
               const newBundle = [];
               if (product.bundle && Array.isArray(product.bundle)) {
@@ -1506,16 +1484,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     newBundle.push(bundleItem);
                   } else {
                     processedBundleItems.forEach((item) => {
-                      const nextBundlePrice = item.price ?? bundleItem.price;
-                      const nextBundleSellingPrice = item.bundle_selling_price ?? item.price ?? bundleItem.bundle_selling_price;
                       const updatedDiscountList2 = (item.discount_list || []).map((discount) => {
-                        var _a3;
+                        var _a2;
                         return {
                           ...discount,
                           metadata: {
                             ...discount.metadata,
                             num: item.num,
-                            custom_product_bundle_map_id: (_a3 = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a3.custom_product_bundle_map_id
+                            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
                         };
@@ -1524,31 +1500,38 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                         ...bundleItem,
                         _id: item._id,
                         product_id: bundleItem.product_id,
-                        price: nextBundlePrice,
+                        price: item.price,
                         num: item.num,
                         discount_list: updatedDiscountList2,
-                        bundle_selling_price: bundleItem.bundle_selling_price !== void 0 ? nextBundleSellingPrice : void 0
+                        bundle_selling_price: bundleItem.bundle_selling_price !== void 0 ? item.price : void 0
                       });
                     });
                   }
                 });
               }
-              const mainSellingPrice = mainProductData.main_product_selling_price ?? mainProductData.price ?? 0;
-              let newTotal = Number(mainSellingPrice || 0);
+              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 && (!((_a2 = mainProductData.discount_list) == null ? void 0 : _a2.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")));
+              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);
+                });
+                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) => {
-                    const bundleSellingPrice = item.bundle_selling_price ?? item.price;
-                    newTotal += Number(bundleSellingPrice) * Number(item.num);
+                    newTotal += Number(item.price) * Number(item.num);
                   });
                   newBundle.forEach((item) => {
-                    var _a3, _b2, _c2;
-                    const originalPrice = ((_c2 = (_b2 = (_a3 = item.discount_list) == null ? void 0 : _a3[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) || item.price;
+                    var _a2, _b2, _c2;
+                    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);
                   });
                 }
@@ -1635,6 +1618,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         appliedProductDetails: []
       };
     });
+    console.log(processedProductList, "processedProductList");
     return {
       productList: processedProductList,
       discountList: [...editModeDiscount, ...updatedDiscountList]