@pisell/pisellos 2.2.267 → 2.2.269

package/dist/modules/Rules/index.js

@@ -150,7 +150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 编辑商品已有商品券
-      if (productList.every(function (item) {
+      if (productList.length > 0 && productList.every(function (item) {
         var _product$discount_lis;
         var product = _this2.hooks.getProduct(item);
         return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || product.total == 0);
@@ -214,6 +214,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       return {
         isAvailable: hasApplicableDiscount,
         discountList: hasApplicableDiscount ? result.discountList : oldDiscountList,
+        evaluatedDiscountList: result.discountList,
         productList: hasApplicableDiscount ? result.productList : productList,
         unavailableReason: unavailableReason
       };
@@ -241,23 +242,37 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function resolveDiscountListForManualOverride(discountList) {
       return this.excludeDiscountListByType(discountList, 'promotion');
     }
+  }, {
+    key: "isItemRewardProductDiscount",
+    value: function isItemRewardProductDiscount(product) {
+      var _product$_promotion;
+      var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+      return (product === null || product === void 0 || (_product$_promotion = product._promotion) === null || _product$_promotion === void 0 ? void 0 : _product$_promotion.actionType) === 'ITEM_REWARD' && discountList.some(function (item) {
+        var _item$metadata, _item$metadata2;
+        return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+      });
+    }
+
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
     value: function getUnavailableReason(discountList, productList) {
+      var _this3 = this;
       // 检查时间限制
       var _iterator = _createForOfIteratorHelper(discountList),
         _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var discount = _step.value;
-          var _iterator3 = _createForOfIteratorHelper(productList),
+          var bookingTimes = productList.length ? productList.map(function (item) {
+            var product = _this3.hooks.getProduct(item);
+            return ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
+          }) : [dayjs().format('YYYY-MM-DD HH:mm:ss')];
+          var _iterator3 = _createForOfIteratorHelper(bookingTimes),
             _step3;
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var item = _step3.value;
-              var product = this.hooks.getProduct(item);
-              var bookingTime = ((product === null || product === void 0 ? void 0 : product.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss');
+              var bookingTime = _step3.value;
               var filteredList = filterDiscountListByBookingTime([discount], bookingTime);
               if (filteredList.length === 0) {
                 return UnavailableReason.TimeLimit;
@@ -288,12 +303,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           try {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var _limitedData$product_;
-              var _item = _step4.value;
-              var _product = this.hooks.getProduct(_item);
+              var item = _step4.value;
+              var product = this.hooks.getProduct(item);
               if (limitedData.type === 'product_all') {
                 hasApplicableProduct = true;
                 break;
-              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(_product.id)) {
+              } else if ((_limitedData$product_ = limitedData.product_ids) !== null && _limitedData$product_ !== void 0 && _limitedData$product_.includes(product.id)) {
                 hasApplicableProduct = true;
                 break;
               }
@@ -318,7 +333,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
       var _options$selectedList,
-        _this3 = this;
+        _this4 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
@@ -351,7 +366,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var discountType = selectedDiscount.tag || selectedDiscount.type;
         return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
       };
-      var resolveReapplyEditModeDiscountPercent = function resolveReapplyEditModeDiscountPercent(originProduct, selectedDiscount) {
+      var resolveReapplyBookingDiscountPercent = function resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount) {
         var _discount2;
         if (!shouldReapplyBookingDiscount(originProduct, selectedDiscount)) return undefined;
         var discountType = (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.tag) || (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.type);
@@ -411,7 +426,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
         var flattened = [];
         productList.forEach(function (originProduct) {
-          var product = _this3.hooks.getProduct(originProduct);
+          var product = _this4.hooks.getProduct(originProduct);
 
           // 1. 添加主商品
           flattened.push({
@@ -429,6 +444,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 2. 展开 bundle 子商品
           if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
             product.bundle.forEach(function (bundleItem, bundleIndex) {
+              var _ref3, _bundleItem$bundle_pr;
               flattened.push({
                 type: 'bundle',
                 originProduct: originProduct,
@@ -437,8 +453,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundleIndex: bundleIndex,
                 // 虚拟商品属性
                 price: Number(bundleItem.price || 0),
-                id: bundleItem._bundle_product_id,
-                // 🔥 使用 _bundle_product_id
+                // 新增商品运行态通常带 _bundle_product_id；订单 hydrate 后只有
+                // bundle_product_id。Change time 必须兼容两种结构，否则 bundle
+                // 子项无法命中折扣卡的 limited_relation_product_data.product_ids。
+                id: (_ref3 = (_bundleItem$bundle_pr = bundleItem.bundle_product_id) !== null && _bundleItem$bundle_pr !== void 0 ? _bundleItem$bundle_pr : bundleItem._bundle_product_id) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_id,
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
                 num: bundleItem.num || 1,
@@ -587,10 +605,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var _ref3, _a$original_price, _ref4, _b$original_price;
+        var _ref4, _a$original_price, _ref5, _b$original_price;
         // 子商品优先使用 original_price，主商品使用 price
-        var priceA = new Decimal(a.type === 'bundle' ? (_ref3 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref3 !== void 0 ? _ref3 : '0' : a.price || '0');
-        var priceB = new Decimal(b.type === 'bundle' ? (_ref4 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : b.price || '0');
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref4 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref5 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref5 !== void 0 ? _ref5 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -712,7 +730,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 辅助函数：检查商品是否对某个折扣卡可用
       var checkItemApplicableForDiscount = function checkItemApplicableForDiscount(flatItem, discount) {
-        var _product2, _product3, _product4, _flatItem$bundleItem, _flatItem$bundleItem2, _product5;
+        var _product, _product2, _product3, _flatItem$bundleItem, _flatItem$bundleItem2, _product4;
         var product;
         if (flatItem.type === 'main') {
           product = flatItem.product;
@@ -729,9 +747,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
+        if (_this4.isItemRewardProductDiscount(product)) {
+          return false;
+        }
 
         // 编辑的商品使用了优惠券不可用
-        var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
+        var isAvailableProduct = flatItem.type === 'main' ? !((_product = product) !== null && _product !== void 0 && _product.booking_id && (_product2 = product) !== null && _product2 !== void 0 && (_product2 = _product2.discount_list) !== null && _product2 !== void 0 && _product2.length && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.every(function (d) {
           return d.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(d.tag || d.type);
         })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.discount_list) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem2 = flatItem.bundleItem) !== null && _flatItem$bundleItem2 !== void 0 && (_flatItem$bundleItem2 = _flatItem$bundleItem2.discount_list) !== null && _flatItem$bundleItem2 !== void 0 && _flatItem$bundleItem2.every(function (d) {
           return d.id;
@@ -752,7 +773,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var limitedData = discount.limited_relation_product_data;
 
         // 时间限制检查
-        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+        var timeLimit = !!filterDiscountListByBookingTime([discount], (((_product4 = product) === null || _product4 === void 0 ? void 0 : _product4.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
         if (!timeLimit) {
           return false;
         }
@@ -772,7 +793,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 套餐规则检查
-        var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+        var isBundleAvailable = _this4.checkPackageSubItemUsageRules(discount, flatItem);
         return isLimitedProduct && isBundleAvailable;
       };
 
@@ -832,7 +853,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref5, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref6, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -860,7 +881,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
-          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref5 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref6 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0);
 
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
@@ -915,32 +936,33 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isItemRewardProductDiscount = _this4.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
-          var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
+          var _product5, _product6, _product7, _product8, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
-          var isHolderMatch = _this3.checkHolderMatch(discount, {
+          var isHolderMatch = _this4.checkHolderMatch(discount, {
             isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
-          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product6 = product) === null || _product6 === void 0 ? void 0 : _product6.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (((_product5 = product) === null || _product5 === void 0 ? void 0 : _product5.startDate) || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
           // 是符合折扣的商品
           var 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;
 
           // 编辑的商品 使用了优惠券不可用
-          var isAvailableProduct = flatItem.type === 'main' ? !((_product7 = product) !== null && _product7 !== void 0 && _product7.booking_id && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.length && (_product9 = product) !== null && _product9 !== void 0 && (_product9 = _product9.discount_list) !== null && _product9 !== void 0 && _product9.every(function (discount) {
+          var isAvailableProduct = flatItem.type === 'main' ? !((_product6 = product) !== null && _product6 !== void 0 && _product6.booking_id && (_product7 = product) !== null && _product7 !== void 0 && (_product7 = _product7.discount_list) !== null && _product7 !== void 0 && _product7.length && (_product8 = product) !== null && _product8 !== void 0 && (_product8 = _product8.discount_list) !== null && _product8 !== void 0 && _product8.every(function (discount) {
             return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && !!(flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem3 = flatItem.bundleItem) !== null && _flatItem$bundleItem3 !== void 0 && (_flatItem$bundleItem3 = _flatItem$bundleItem3.discount_list) !== null && _flatItem$bundleItem3 !== void 0 && _flatItem$bundleItem3.length) && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem4 = flatItem.bundleItem) !== null && _flatItem$bundleItem4 !== void 0 && (_flatItem$bundleItem4 = _flatItem$bundleItem4.discount_list) !== null && _flatItem$bundleItem4 !== void 0 && _flatItem$bundleItem4.every(function (discount) {
             return discount.id;
           }));
 
           // 套餐是否可用判断
-          var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+          var isBundleAvailable = _this4.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -988,13 +1010,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
         var optionDiscountAmount = 0;
         var discountedOptions = options.map(function (option) {
-          var _ref6, _ref7, _option$_original_pri, _ref8, _option$num, _rest$price, _option$_original_pri2;
+          var _ref7, _ref8, _option$_original_pri, _ref9, _option$num, _rest$price, _option$_original_pri2;
           // 折前单价：优先 price，缺失再 add_price；已写回折后价时用 _original_price（或旧字段 _original_add_price）
-          var rawUnit = (_ref6 = (_ref7 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref7 !== void 0 ? _ref7 : option.price) !== null && _ref6 !== void 0 ? _ref6 : option.add_price;
+          var rawUnit = (_ref7 = (_ref8 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref8 !== void 0 ? _ref8 : option.price) !== null && _ref7 !== void 0 ? _ref7 : option.add_price;
           var baseUnitNum = Number(rawUnit !== null && rawUnit !== void 0 ? rawUnit : 0);
           if (baseUnitNum <= 0) return option;
           var discountedPrice = getDiscountAmount(discount, baseUnitNum, baseUnitNum);
-          var optQty = Number((_ref8 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref8 !== void 0 ? _ref8 : 1);
+          var optQty = Number((_ref9 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref9 !== void 0 ? _ref9 : 1);
           optionDiscountAmount = new Decimal(optionDiscountAmount).plus(new Decimal(baseUnitNum).minus(discountedPrice).mul(optQty)).toNumber();
           var _original_add_price = option._original_add_price,
             rest = _objectWithoutProperties(option, _excluded);
@@ -1028,9 +1050,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var getOptionTotal = function getOptionTotal(options) {
         if (!(options !== null && options !== void 0 && options.length)) return 0;
         return options.reduce(function (sum, opt) {
-          var _ref9, _opt$price, _ref10, _opt$num;
-          var unit = Number((_ref9 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
-          var n = Number((_ref10 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref10 !== void 0 ? _ref10 : 1);
+          var _ref10, _opt$price, _ref11, _opt$num;
+          var unit = Number((_ref10 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+          var n = Number((_ref11 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref11 !== void 0 ? _ref11 : 1);
           return new Decimal(sum).plus(new Decimal(unit).mul(n)).toNumber();
         }, 0);
       };
@@ -1038,7 +1060,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product10, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product11;
+        var _product9, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product10;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -1062,8 +1084,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
-        var isPersistedProduct = ((_product10 = product) === null || _product10 === void 0 ? void 0 : _product10.booking_id) || ((_originProduct = originProduct) === null || _originProduct === void 0 ? void 0 : _originProduct.order_detail_id) || ((_originProduct2 = originProduct) === null || _originProduct2 === void 0 ? void 0 : _originProduct2.orderDetailId) || ((_originProduct3 = originProduct) === null || _originProduct3 === void 0 ? void 0 : _originProduct3.booking_id);
-        var hasExistingWalletDiscount = ((_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.length) && ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 ? void 0 : _product11.every(function (discount) {
+        var isPersistedProduct = ((_product9 = product) === null || _product9 === void 0 ? void 0 : _product9.booking_id) || ((_originProduct = originProduct) === null || _originProduct === void 0 ? void 0 : _originProduct.order_detail_id) || ((_originProduct2 = originProduct) === null || _originProduct2 === void 0 ? void 0 : _originProduct2.orderDetailId) || ((_originProduct3 = originProduct) === null || _originProduct3 === void 0 ? void 0 : _originProduct3.booking_id);
+        var hasExistingWalletDiscount = ((_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.length) && ((_product10 = product) === null || _product10 === void 0 || (_product10 = _product10.discount_list) === null || _product10 === void 0 ? void 0 : _product10.every(function (discount) {
           var _discount$id, _discount$discount4;
           var discountIdentity = (_discount$id = discount.id) !== null && _discount$id !== void 0 ? _discount$id : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.resource_id;
           var discountType = discount.tag || discount.type;
@@ -1074,17 +1096,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (isPersistedProduct && hasExistingWalletDiscount) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
-          } else {
-            processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              processed: true
-            })]);
           }
+          // bundle 虚拟项没有携带完整的历史价格字段。这里不写入 processed map，
+          // 重组阶段会直接保留原始 bundleItem，避免把 bundle_selling_price
+          // 覆盖为未折扣的 price，导致已支付金额再次进入应付。
           return;
         }
 
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          if (_this4.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
           var currentOriginUid = getOriginProductUid(originProduct);
@@ -1130,7 +1152,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
-          var isHolderMatch = _this3.checkHolderMatch(discount, {
+          var isHolderMatch = _this4.checkHolderMatch(discount, {
             isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
@@ -1148,13 +1170,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               return false;
             }
             // 检查 package_sub_item_usage_rules
-            if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
+            if (!_this4.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
             }
             return true;
           } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
             // 检查 package_sub_item_usage_rules
-            if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
+            if (!_this4.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
             }
             return true;
@@ -1162,28 +1184,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 选择第一个适用的优惠券（已经按过期时间排序）
-        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
-        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
-        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
+        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
+        }) : undefined;
+
+        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
+        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
         var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
+        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
+          var _product$discount_lis5, _product$discount_lis6, _product11, _product11$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : ((_product$discount_lis5 = product.discount_list) === null || _product$discount_lis5 === void 0 ? void 0 : _product$discount_lis5.some(function (item) {
             return item.type === 'product';
           })) || product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref11;
-            return !((_ref11 = item.discount_list || []) !== null && _ref11 !== void 0 && _ref11.length);
-          }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product12 = product) === null || _product12 === void 0 || (_product12 = _product12.discount_list) === null || _product12 === void 0 || (_product12$every = _product12.every) === null || _product12$every === void 0 ? void 0 : _product12$every.call(_product12, function (item) {
+            var _ref12;
+            return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+          }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
-          if (product.inPromotion) {
+          isItemRewardProductDiscount = _this4.isItemRewardProductDiscount(product);
+          if (product.inPromotion && !isItemRewardProductDiscount) {
             isManualDiscount = false;
           }
         } else {
@@ -1194,8 +1224,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref12;
-              return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+              var _ref13;
+              return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1265,7 +1295,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 主商品：保持原有逻辑，还原 option 价格
             var restoredOptions = restoreOptionPrices(product.options);
             if (product.isClient) {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              processedProductsMap.set(product._id, [_this4.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
                 origin_total: getProductOriginTotalPrice({
                   product: {
                     original_price: product.original_price
@@ -1285,37 +1315,39 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref13, _product$_promotion$f, _product13, _product$origin_total;
-              var total = product.inPromotion ? (_ref13 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref13 !== void 0 ? _ref13 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref14, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref14 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
                 var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
+              processedProductsMap.set(product._id, [_this4.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
                 price: product.price,
-                main_product_selling_price: product.price
-              } : {
+                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
+              }, isItemRewardProductDiscount ? {
+                total: total
+              } : {}) : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(product.discount_list) : _this4.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
             var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this3.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
+              discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this4.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -1356,8 +1388,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var _product$total2;
               _total = (_product$total2 = product.total) !== null && _product$total2 !== void 0 ? _product$total2 : product.origin_total;
             }
-            arr.push(_this3.hooks.setProduct(originProduct, {
-              discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+            arr.push(_this4.hooks.setProduct(originProduct, {
+              discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0],
               total: _total
@@ -1381,7 +1413,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if (_this3.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
+            if (_this4.filterDiscountListByType(product.discount_list, 'promotion').length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1408,9 +1440,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
               mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
-            } else if (resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
+            } else if (resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
               // Change time 重套编辑态折扣卡时，历史 par_value 不是运行时折扣口径，优先使用后端快照里的 percent。
-              var percent = resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount);
+              var percent = resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount);
               reapplyDiscountPercent = new Decimal(percent).toFixed(2);
               mainProductSellingPrice = new Decimal(product.price || 0).mul(new Decimal(100).minus(percent)).div(100).toDecimalPlaces(2).toNumber();
               amount = new Decimal(product.price).minus(mainProductSellingPrice).toNumber();
@@ -1468,7 +1500,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
-              arr.push(_this3.hooks.setProduct(originProduct, {
+              arr.push(_this4.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
                 // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
                 price: isGoodPass ? mainProductSellingPrice : product.price,
@@ -1486,8 +1518,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 options: discountedOptions
               }));
             } else {
-              arr.push(_this3.hooks.setProduct(originProduct, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
+              arr.push(_this4.hooks.setProduct(originProduct, {
+                discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
                 _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
@@ -1576,7 +1608,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _reapplyDiscountPerce2, _flatItem$parentProdu9;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
@@ -1594,11 +1626,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var targetProductTotal;
             var fixedAmountPerItem;
             var _productDiscountDifference;
+            var _reapplyDiscountPercent;
             if (_isOrderLevel && _productAllocation) {
               // order_level：使用预计算的单价折扣金额（已经是单价，无需再除以数量）
               fixedAmountPerItem = _productAllocation.discountAmount;
               _productDiscountDifference = _productAllocation.difference;
               targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+            } else if (resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount3) !== undefined) {
+              // hydrate 后 par_value 可能是余额/原值（例如 3500），百分比口径以
+              // 后端折扣快照 discount.percent 为准，与主商品重套逻辑保持一致。
+              var _percent = resolveReapplyBookingDiscountPercent(originProduct, _selectedDiscount3);
+              _reapplyDiscountPercent = new Decimal(_percent).toFixed(2);
+              targetProductTotal = new Decimal(_productOriginTotal).mul(new Decimal(100).minus(_percent)).div(100).toDecimalPlaces(2).toNumber();
+              fixedAmountPerItem = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
             } else {
               // item_level 或其他类型：使用原有逻辑
               targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
@@ -1619,7 +1659,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
                 product_id: product.id || product.product_id,
-                percent: _selectedDiscount3.par_value,
+                percent: (_reapplyDiscountPerce2 = _reapplyDiscountPercent) !== null && _reapplyDiscountPerce2 !== void 0 ? _reapplyDiscountPerce2 : _selectedDiscount3.par_value,
                 discount_product_id: _selectedDiscount3.product_id
               },
               metadata: _objectSpread({
@@ -1652,7 +1692,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var reconstructProductsWithBundle = function reconstructProductsWithBundle(processedProductsMap, processedFlatItemsMap, originalProductList) {
         var result = [];
         originalProductList.forEach(function (originProduct) {
-          var product = _this3.hooks.getProduct(originProduct);
+          var product = _this4.hooks.getProduct(originProduct);
 
           // 获取主商品处理结果
           var mainProductArr = processedProductsMap.get(product._id);
@@ -1661,8 +1701,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var getDefaultProduct = function getDefaultProduct() {
               var restoredOptions = restoreOptionPrices(product.options);
               if (product.isClient) {
-                return _this3.hooks.setProduct(originProduct, {
-                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+                return _this4.hooks.setProduct(originProduct, {
+                  discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
                   price: product.price,
                   origin_total: getProductOriginTotalPrice({
                     product: {
@@ -1683,8 +1723,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   options: restoredOptions
                 });
               } else {
-                return _this3.hooks.setProduct(originProduct, {
-                  discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
+                return _this4.hooks.setProduct(originProduct, {
+                  discount_list: _this4.filterDiscountListByType(product.discount_list, 'promotion'),
                   total: product.total,
                   origin_total: product.origin_total,
                   price: product.price,
@@ -1732,10 +1772,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }
 
             // 🔥 2. 如果有子商品应用了商品券，且主商品数量大于1，需要拆分主商品
-            var mainProductQuantity = mainProductArr[0] ? _this3.hooks.getProduct(mainProductArr[0]).quantity : 1;
+            var mainProductQuantity = mainProductArr[0] ? _this4.hooks.getProduct(mainProductArr[0]).quantity : 1;
             if (hasGoodPassApplied && mainProductArr.length === 1 && mainProductQuantity > 1) {
               var mainProduct = mainProductArr[0];
-              var mainProductData = _this3.hooks.getProduct(mainProduct);
+              var mainProductData = _this4.hooks.getProduct(mainProduct);
 
               // 🔥 方案：拆分成2个主商品
               // 1. 一个主商品(qty=1)包含拆分后的bundle
@@ -1750,11 +1790,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   processedItems.forEach(function (item) {
                     // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                     var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata;
+                      var _item$metadata3;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1773,11 +1813,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata2;
+                      var _item$metadata4;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1818,8 +1858,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                var _item$metadata3;
-                return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
+                var _item$metadata5;
+                return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
               });
               if (mainDiscountList && mainDiscountList.length > 0) {
                 var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1850,7 +1890,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 添加第一个主商品：qty=1，包含拆分后的bundle
-              result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
+              result.push(_this4.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
                 _id: "".concat(mainProductData._id.split('___')[0], "___split_discount"),
                 quantity: 1,
                 discount_list: updatedMainDiscountList,
@@ -1892,8 +1932,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  var _item$metadata4;
-                  return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
+                  var _item$metadata6;
+                  return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;
@@ -1922,7 +1962,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 newOriginTotalOriginal = new Decimal(newOriginTotalOriginal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 添加第二个主商品：qty=原quantity-1，包含原始bundle
-                result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
+                result.push(_this4.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
                   _id: "".concat(mainProductData._id.split('___')[0], "___split_normal"),
                   quantity: mainProductQuantity - 1,
                   discount_list: updatedMainDiscountListOriginal,
@@ -1934,8 +1974,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
-                var mainProductData = _this3.hooks.getProduct(mainProduct);
+                var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var mainProductData = _this4.hooks.getProduct(mainProduct);
 
                 // 重组bundle
                 var newBundle = [];
@@ -1949,9 +1989,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref14, _item$bundle_selling_;
+                        var _item$price, _ref15, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref14 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref14 !== void 0 ? _ref14 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref15 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -1978,7 +2018,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref15 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref15 !== void 0 ? _ref15 : 0;
+                var mainSellingPrice = (_ref16 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref16 !== void 0 ? _ref16 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2022,7 +2062,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 newOriginTotal = new Decimal(newOriginTotal).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
 
                 // 生成最终的主商品
-                result.push(_this3.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
+                result.push(_this4.hooks.setProduct(mainProduct, _objectSpread(_objectSpread({}, mainProductData), {}, {
                   bundle: newBundle,
                   total: newTotal,
                   origin_total: newOriginTotal
@@ -2126,14 +2166,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref16 = packageScope || {},
-        scopeType = _ref16.type,
-        _ref16$exclude_bundle = _ref16.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref16$exclude_bundle === void 0 ? [] : _ref16$exclude_bundle,
-        _ref16$include_bundle = _ref16.include_bundle_product_ids,
-        include_bundle_product_ids = _ref16$include_bundle === void 0 ? [] : _ref16$include_bundle,
-        _ref16$filter = _ref16.filter,
-        filter = _ref16$filter === void 0 ? 0 : _ref16$filter;
+      var _ref17 = packageScope || {},
+        scopeType = _ref17.type,
+        _ref17$exclude_bundle = _ref17.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref17$exclude_bundle === void 0 ? [] : _ref17$exclude_bundle,
+        _ref17$include_bundle = _ref17.include_bundle_product_ids,
+        include_bundle_product_ids = _ref17$include_bundle === void 0 ? [] : _ref17$include_bundle,
+        _ref17$filter = _ref17.filter,
+        filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买