@pisell/pisellos 0.0.568 → 0.10.1

package/dist/modules/Rules/index.js

@@ -18,6 +18,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -116,7 +118,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 非表单类型 holder 视为匹配
       if (((_discount$holder = discount.holder) === null || _discount$holder === void 0 ? void 0 : _discount$holder.holder_type) !== 'form') return true;
       // 主预约holder, 目前（20251124）默认只考虑单个holder的情况
-      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : undefined;
+      // 旧版 holders[0].form_record_id 新版 holders[0]
+      var orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : undefined;
       var productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
       // 商品不需要选holder，则不对比holder，直接返回true，
       if (!product.isNeedHolder) return true;
@@ -169,8 +172,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
-        holders: holders,
         orderTotalAmount: orderTotalAmount,
+        holders: holders,
         isFormSubject: isFormSubject
       }, {
         scan: true
@@ -223,6 +226,21 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       });
     }
 
+    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
+  }, {
+    key: "excludeDiscountListByType",
+    value: function excludeDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type !== type && item.tag !== type;
+      });
+    }
+
+    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
+  }, {
+    key: "resolveDiscountListForManualOverride",
+    value: function resolveDiscountListForManualOverride(discountList) {
+      return this.excludeDiscountListByType(discountList, 'promotion');
+    }
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -299,12 +317,50 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
-      var _this3 = this;
+      var _options$selectedList,
+        _this3 = this;
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject,
         orderTotalAmount = _ref2.orderTotalAmount;
+      var resolveIsFormSubject = function resolveIsFormSubject(product) {
+        return typeof isFormSubject === 'function' ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
+      };
+
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = productList.find(function (n) {
+        return n.booking_id;
+      }) && productList.find(function (n) {
+        return !n.booking_id;
+      });
+      var reapplyBookingDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter(function (uid) {
+        return uid !== undefined && uid !== null && uid !== '';
+      }).map(String));
+      var getOriginProductUid = function getOriginProductUid(originProduct) {
+        var _originProduct$metada, _originProduct$metada2;
+        var uid = (_originProduct$metada = originProduct === null || originProduct === void 0 || (_originProduct$metada2 = originProduct.metadata) === null || _originProduct$metada2 === void 0 ? void 0 : _originProduct$metada2.unique_identification_number) !== null && _originProduct$metada !== void 0 ? _originProduct$metada : originProduct === null || originProduct === void 0 ? void 0 : originProduct.unique_identification_number;
+        if (uid === undefined || uid === null || uid === '') return undefined;
+        return String(uid);
+      };
+      var shouldReapplyBookingDiscount = function shouldReapplyBookingDiscount(originProduct, selectedDiscount) {
+        if (!selectedDiscount) return false;
+        var uid = getOriginProductUid(originProduct);
+        if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
+        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 _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);
+        if (discountType !== 'discount_card' && discountType !== 'product_discount_card') {
+          return undefined;
+        }
+        var percent = Number((_discount2 = selectedDiscount.discount) === null || _discount2 === void 0 ? void 0 : _discount2.percent);
+        return Number.isFinite(percent) ? percent : undefined;
+      };
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -333,11 +389,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+      var hasDiscountInput = editModeDiscount.length > 0 || addModeDiscount.length > 0 || Boolean(options === null || options === void 0 ? void 0 : options.discountId) || Boolean(options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.length) || Boolean(options === null || options === void 0 ? void 0 : options.scan);
+      if (!hasDiscountInput) {
+        return {
+          discountList: discountList,
+          productList: productList
+        };
+      }
+      var canUseEditModeDiscountForReapply = function canUseEditModeDiscountForReapply(discount) {
+        var discountType = discount.tag || discount.type;
+        return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+      };
 
-      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑
-      var filteredDiscountList = addModeDiscount.filter(function (discount) {
+      // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑。
+      // Change time 重报价需要把已选编辑态折扣卡重新放入候选，再由目标 uid 限定作用范围。
+      var filteredDiscountList = [].concat(_toConsumableArray(addModeDiscount.filter(function (discount) {
         return !discount.isManualSelect;
-      });
+      })), _toConsumableArray(editModeDiscount.filter(canUseEditModeDiscountForReapply)));
 
       // 🔥 扁平化商品列表：将 bundle 子商品展开为虚拟商品
       var flattenProductsWithBundle = function flattenProductsWithBundle(productList) {
@@ -518,14 +586,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 扁平化商品列表（包含主商品和bundle子商品）
       var flattenedList = flattenProductsWithBundle(productList);
 
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      var isEditModeAddNewProduct = flattenedList.find(function (n) {
-        return n.booking_id;
-      }) && flattenedList.find(function (n) {
-        return !n.booking_id;
-      });
-
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
         var _ref3, _a$original_price, _ref4, _b$original_price;
@@ -605,14 +665,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
-      // 检查商品是否被排除（全品类）
-      var isProductIncludedByLimitedData = function isProductIncludedByLimitedData(limitedData, productId) {
-        var excludedIds = (limitedData === null || limitedData === void 0 ? void 0 : limitedData.exclude_product_ids) || [];
-        var isExcluded = (limitedData === null || limitedData === void 0 ? void 0 : limitedData.filter) === 1 && excludedIds.some(function (id) {
-          return String(id) === String(productId);
-        });
-        return !isExcluded;
-      };
 
       /**
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
@@ -637,19 +689,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 统计每个 product_id（商品券商品id）已使用的数量，用于 maxUsagePerOrder 限制
       var usedProductIdCounts = new Map();
 
-      // 🔥 统计每张折扣卡的 applicableProductLimit 已使用次数（跨商品全局计数）
-      var usedDiscountCardLimitCounts = new Map();
-
-      // 🔥 预先将 editModeDiscount 中的折扣卡计入 applicableProductLimit 已使用次数
-      editModeDiscount.forEach(function (discount) {
-        var discountType = discount.tag || discount.type;
-        if (['discount_card', 'product_discount_card'].includes(discountType)) {
-          var _discount$metadata4;
-          var currentCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
-          usedDiscountCardLimitCounts.set(discount.id, currentCount + (((_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.num) || 1));
-        }
-      });
-
       // 记录每个优惠券适用的商品ID
       var discountApplicability = new Map();
 
@@ -784,6 +823,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       });
+
       // 🔥 第三步：识别 order_level 折扣卡并预计算分摊（排除被其他专属折扣卡占用的商品）
       sortedDiscountList.forEach(function (discount) {
         if (!isOrderLevelFixedAmountDiscount(discount)) {
@@ -863,7 +903,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _flatItem$parentProdu5;
           // bundle子商品：构造虚拟商品对象
           product = {
-            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -872,7 +911,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             total: flatItem.total,
             origin_total: flatItem.origin_total,
             booking_id: flatItem.booking_id,
-            discount_list: flatItem.discount_list || []
+            discount_list: flatItem.discount_list || [],
+            startDate: (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate
           };
           originProduct = flatItem.originProduct;
         }
@@ -882,7 +922,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到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, {
-            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            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;
@@ -902,7 +942,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
-            var _discountApplicabilit, _discount$metadata5, _discount$metadata6;
+            var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
 
@@ -918,14 +958,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               type: discountType,
               tag: discountType,
               discount: {
-                discount_card_type: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_card_type,
+                discount_card_type: discount === null || discount === void 0 || (_discount$metadata4 = discount.metadata) === null || _discount$metadata4 === void 0 ? void 0 : _discount$metadata4.discount_card_type,
                 fixed_amount: product.price,
-                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata6 = discount.metadata) === null || _discount$metadata6 === void 0 ? void 0 : _discount$metadata6.discount_calculation_mode,
+                discount_calculation_mode: discount === null || discount === void 0 || (_discount$metadata5 = discount.metadata) === null || _discount$metadata5 === void 0 ? void 0 : _discount$metadata5.discount_calculation_mode,
                 resource_id: discount.id,
                 title: discount.format_title,
                 original_amount: product.price || product.origin_total,
                 pre_value: discount.par_value,
-                product_id: originProduct.id,
+                product_id: originProduct.id || originProduct.product_id,
                 discount_product_id: discount.product_id
               },
               metadata: {
@@ -1000,17 +1040,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product10, _product$discount_lis2, _product11, _selectedDiscount$con;
+        var _product10, _originProduct, _originProduct2, _originProduct3, _product$discount_lis2, _product11;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$parentProdu6, _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7;
+          var _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7, _flatItem$parentProdu6;
           // bundle子商品
           product = {
-            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu6 = flatItem.parentProduct) === null || _flatItem$parentProdu6 === void 0 ? void 0 : _flatItem$parentProdu6.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -1020,15 +1059,21 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             original_price: flatItem === null || flatItem === void 0 || (_flatItem$bundleItem5 = flatItem.bundleItem) === null || _flatItem$bundleItem5 === void 0 ? void 0 : _flatItem$bundleItem5.original_price,
             origin_total: flatItem === null || flatItem === void 0 || (_flatItem$bundleItem6 = flatItem.bundleItem) === null || _flatItem$bundleItem6 === void 0 ? void 0 : _flatItem$bundleItem6.original_price,
             booking_id: flatItem.booking_id,
-            discount_list: (flatItem === null || flatItem === void 0 || (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.discount_list) || []
+            discount_list: (flatItem === null || flatItem === void 0 || (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.discount_list) || [],
+            startDate: (_flatItem$parentProdu6 = flatItem.parentProduct) === null || _flatItem$parentProdu6 === void 0 ? void 0 : _flatItem$parentProdu6.startDate
           };
           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 _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;
+          return Boolean(discountIdentity && ['good_pass', 'discount_card', 'product_discount_card'].includes(discountType));
+        }));
 
-        // 已有优惠的商品跳过
-        if ((_product10 = product) !== null && _product10 !== void 0 && _product10.booking_id && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.length && (_product11 = product) !== null && _product11 !== void 0 && (_product11 = _product11.discount_list) !== null && _product11 !== void 0 && _product11.every(function (discount) {
-          return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
-        })) {
+        // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
+        if (isPersistedProduct && hasExistingWalletDiscount) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
           } else {
@@ -1044,7 +1089,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis3, _product$discount_lis4;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
-          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+          var currentOriginUid = getOriginProductUid(originProduct);
+          var isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
+          if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
+            var uid = currentOriginUid;
+            if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
+            if (!discount.isSelected) return false;
+          }
+          if (['good_pass', 'discount_card', 'product_discount_card'].includes(discountType) && !isReapplyEditModeDiscountForProduct) {
             var _discount$config2;
             // 如果策略检查后没有config，说明不可用
             if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config2 = discount.config) !== null && _discount$config2 !== void 0 && _discount$config2.isAvailable)) {
@@ -1076,25 +1128,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }
             }
           }
-
-          // 🔥 检查折扣卡的 applicableProductLimit 限制：折扣卡可使用的最大次数（跨商品全局）
-          var discountTypeForLimit = discount.tag || discount.type;
-          if (['discount_card', 'product_discount_card'].includes(discountTypeForLimit)) {
-            var _discount$config4;
-            var applicableProductLimitConfig = ((_discount$config4 = discount.config) === null || _discount$config4 === void 0 ? void 0 : _discount$config4.applicableProductLimit) || 0;
-            if (applicableProductLimitConfig > 0) {
-              var currentUsedLimitCount = usedDiscountCardLimitCounts.get(discount.id) || 0;
-              if (currentUsedLimitCount >= applicableProductLimitConfig) {
-                return false;
-              }
-            }
-          }
           var limitedData = discount.limited_relation_product_data;
 
           // 拿到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, {
-            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
+            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);
           // 如果 holder 不匹配，则不适用
@@ -1107,10 +1146,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
-            if (!isProductIncludedByLimitedData(limitedData, product.id)) {
+            if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
               return false;
             }
-
             // 检查 package_sub_item_usage_rules
             if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;
@@ -1137,12 +1175,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
         if (flatItem.type === 'main') {
-          var _product$discount_lis5, _product12, _product12$every;
+          var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
-          isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
+          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_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.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) {
+          }) && (!((_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) {
             return item.type === 'product';
           })));
           if (product.inPromotion) {
@@ -1152,11 +1192,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // bundle子商品：判断父主商品是否手动折扣
           var parentProduct = flatItem.parentProduct;
           if (parentProduct) {
-            var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3;
-            isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
+            var _parentProduct$discou, _parentProduct$discou2, _parentProduct$discou3, _parentProduct$discou4;
+            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);
-            }) && (!((_parentProduct$discou = parentProduct.discount_list) !== null && _parentProduct$discou !== void 0 && _parentProduct$discou.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou2 = parentProduct.discount_list) === null || _parentProduct$discou2 === void 0 || (_parentProduct$discou3 = _parentProduct$discou2.every) === null || _parentProduct$discou3 === void 0 ? void 0 : _parentProduct$discou3.call(_parentProduct$discou2, function (item) {
+            }) && (!((_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';
             })));
           }
@@ -1164,9 +1206,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId) {
-          var _product$discount_lis6;
+          var _product$discount_lis7;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.some(function (item) {
+          if (flatItem.type === 'main' && (_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
             var _item$discount;
             return ((_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) === options.discountId;
           })) {
@@ -1174,8 +1216,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis7, _flatItem$parentProdu7;
-            if ((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
+            var _product$discount_lis8, _flatItem$parentProdu7;
+            if ((_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
               var _item$discount2;
               return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
             }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
@@ -1187,11 +1229,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
         if (options !== null && options !== void 0 && options.selectedList) {
-          var _product$discount_lis8;
+          var _product$discount_lis9;
           // 主商品：检查自己的 discount_list
-          if (flatItem.type === 'main' && (_product$discount_lis8 = product.discount_list) !== null && _product$discount_lis8 !== void 0 && _product$discount_lis8.some(function (item) {
-            var _options$selectedList;
-            return options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.some(function (n) {
+          if (flatItem.type === 'main' && (_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
+            var _options$selectedList2;
+            return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
               var _item$discount4;
               return n.discountId === ((_item$discount4 = item.discount) === null || _item$discount4 === void 0 ? void 0 : _item$discount4.resource_id);
             });
@@ -1200,16 +1242,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis9, _flatItem$parentProdu8;
-            if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
-              var _options$selectedList2;
-              return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
+            var _product$discount_lis10, _flatItem$parentProdu8;
+            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
+              var _options$selectedList3;
+              return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
                 var _item$discount5;
                 return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
               });
             }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
-              var _options$selectedList3;
-              return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
+              var _options$selectedList4;
+              return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
                 var _item$discount6;
                 return n.discountId === ((_item$discount6 = item.discount) === null || _item$discount6 === void 0 ? void 0 : _item$discount6.resource_id);
               });
@@ -1245,12 +1287,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref13, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
+              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 main_product_selling_price = (_product$price2 = product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product.main_product_selling_price;
+              var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
               }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
@@ -1263,37 +1305,31 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
-                original_price: product.original_price,
                 price: product.price,
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8;
+            var _flatItem$bundleItem8, _flatItem$bundleItem9;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
+              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'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct) {
+        var shouldReapplyBookingDiscountForProduct = shouldReapplyBookingDiscount(originProduct, selectedDiscount);
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan) && !isEditModeAddNewProduct && !shouldReapplyBookingDiscountForProduct) {
           return;
         }
 
-        // 是否需要拆分（商品券需要拆分，折扣卡在 applicableProductLimit > 0 时也需要拆分）
-        var discountType = selectedDiscount.tag || selectedDiscount.type;
-        var isGoodPass = discountType === 'good_pass';
-        var isDiscountCard = ['discount_card', 'product_discount_card'].includes(discountType);
-        var applicableProductLimit = ((_selectedDiscount$con = selectedDiscount.config) === null || _selectedDiscount$con === void 0 ? void 0 : _selectedDiscount$con.applicableProductLimit) || 0;
-
-        // 商品券始终需要拆分，折扣卡在 applicableProductLimit > 0 时需要拆分
-        var isNeedSplit = isGoodPass || isDiscountCard && applicableProductLimit > 0;
+        // 是否需要拆分（商品券需要拆分）
+        var isNeedSplit = (selectedDiscount.tag || selectedDiscount.type) === 'good_pass';
 
         // 需要拆分出来的数量
         var totalQuantity = product.quantity || product.num || 1;
@@ -1301,22 +1337,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return (item.tag || item.type) === 'good_pass';
         }).length;
 
-        // 🔥 计算最大使用次数限制
-        var maxUsageLimit;
-        if (isGoodPass) {
-          // 商品券：使用 maxUsagePerOrder 限制
-          maxUsageLimit = availableGoodPassCount;
-          if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
-            maxUsageLimit = Math.min(availableGoodPassCount, selectedDiscount.config.maxUsagePerOrder);
-          }
-        } else if (isDiscountCard && applicableProductLimit > 0) {
-          // 折扣卡：使用 applicableProductLimit 限制（一个商品使用一次折扣卡算1次）
-          // 需要减去已使用次数（跨商品全局计数）
-          var usedLimitCount = usedDiscountCardLimitCounts.get(selectedDiscount.id) || 0;
-          maxUsageLimit = Math.max(0, applicableProductLimit - usedLimitCount);
-        } else {
-          // 其他情况不拆分
-          maxUsageLimit = 1;
+        // 🔥 如果selectedDiscount有config配置，则使用config.maxUsagePerOrder限制使用次数
+        var maxUsageLimit = availableGoodPassCount;
+        if (selectedDiscount.config && selectedDiscount.config.maxUsagePerOrder) {
+          maxUsageLimit = Math.min(availableGoodPassCount, selectedDiscount.config.maxUsagePerOrder);
         }
         var splitCount = isNeedSplit ? Math.min(product.quantity || product.num || 1, maxUsageLimit) : 1;
         var arr = [];
@@ -1341,26 +1365,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct, _selectedDiscount$con2, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
-            // 商品券：每个拆分商品使用不同的商品券（从 applicableDiscounts 按索引取）
-            // 折扣卡：所有拆分商品使用同一张折扣卡（selectedDiscountCard 或 applicableDiscounts[0]）
-            var currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
+            var _originProduct4, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
+            // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
+            var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
-            usedDiscounts.set(currentSelectedDiscount.id, true);
+            usedDiscounts.set(_selectedDiscount.id, true);
             // 🔥 更新 product_id 使用计数
-            if ((currentSelectedDiscount.tag || currentSelectedDiscount.type) === 'good_pass') {
-              var currentCount = usedProductIdCounts.get(currentSelectedDiscount.product_id) || 0;
-              usedProductIdCounts.set(currentSelectedDiscount.product_id, currentCount + 1);
-            }
-            // 🔥 更新折扣卡 applicableProductLimit 使用计数（跨商品全局）
-            var currentDiscountTypeForCount = currentSelectedDiscount.tag || currentSelectedDiscount.type;
-            if (['discount_card', 'product_discount_card'].includes(currentDiscountTypeForCount)) {
-              var currentLimitCount = usedDiscountCardLimitCounts.get(currentSelectedDiscount.id) || 0;
-              usedDiscountCardLimitCounts.set(currentSelectedDiscount.id, currentLimitCount + 1);
+            if ((_selectedDiscount.tag || _selectedDiscount.type) === 'good_pass') {
+              var currentCount = usedProductIdCounts.get(_selectedDiscount.product_id) || 0;
+              usedProductIdCounts.set(_selectedDiscount.product_id, currentCount + 1);
             }
 
             // 记录实际应用了优惠券的商品信息
-            var appliedProducts = appliedDiscountProducts.get(currentSelectedDiscount.id) || [];
+            var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
 
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
@@ -1369,16 +1386,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
-            if (Number(((_originProduct = originProduct) === null || _originProduct === void 0 || (_originProduct = _originProduct._productInit) === null || _originProduct === void 0 ? void 0 : _originProduct.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+            if (Number(((_originProduct4 = originProduct) === null || _originProduct4 === void 0 || (_originProduct4 = _originProduct4._productInit) === null || _originProduct4 === void 0 ? void 0 : _originProduct4.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
               productOriginTotal = product.total;
             }
 
             // 计算使用折扣卡/商品券以后，单个商品的总 total
             // 🔥 检查是否是 order_level 固定金额折扣卡
-            var isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
-            var orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
+            var isOrderLevel = isOrderLevelFixedAmountDiscount(_selectedDiscount);
+            var orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(_selectedDiscount.id) : null;
             var productAllocation = orderLevelAllocation === null || orderLevelAllocation === void 0 ? void 0 : orderLevelAllocation.get(flatItem._id);
-            var isDeductOptionPrice = !!((_selectedDiscount$con2 = selectedDiscount.config) !== null && _selectedDiscount$con2 !== void 0 && _selectedDiscount$con2.deductOptionPrice);
+            var isDeductOptionPrice = !!((_selectedDiscount$con = _selectedDiscount.config) !== null && _selectedDiscount$con !== void 0 && _selectedDiscount$con.deductOptionPrice);
 
             // 主商品折后价（不含 option）；勿与 option 合计混在同一变量，否则 main_product_selling_price 错误
             var mainProductSellingPrice = void 0;
@@ -1386,18 +1403,25 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var productDiscountDifference = void 0;
             var discountedOptions = product.options;
             var optionDiscountAmount = 0;
+            var reapplyDiscountPercent = void 0;
             if (isOrderLevel && productAllocation) {
               // order_level：使用预计算的分摊金额
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
               mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
+            } else if (resolveReapplyEditModeDiscountPercent(originProduct, _selectedDiscount) !== undefined) {
+              // Change time 重套编辑态折扣卡时，历史 par_value 不是运行时折扣口径，优先使用后端快照里的 percent。
+              var percent = resolveReapplyEditModeDiscountPercent(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();
             } else {
               // item_level 或其他类型：使用原有逻辑
-              mainProductSellingPrice = getDiscountAmount(currentSelectedDiscount, product.price, product.price);
+              mainProductSellingPrice = getDiscountAmount(_selectedDiscount, product.price, product.price);
               amount = new Decimal(product.price).minus(new Decimal(mainProductSellingPrice)).toNumber();
             }
             if (isDeductOptionPrice && (_product$options = product.options) !== null && _product$options !== void 0 && _product$options.length) {
-              var optionResult = applyDiscountToOptions(product.options, currentSelectedDiscount);
+              var optionResult = applyDiscountToOptions(product.options, _selectedDiscount);
               discountedOptions = optionResult.discountedOptions;
               optionDiscountAmount = optionResult.optionDiscountAmount;
             }
@@ -1410,29 +1434,28 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // discount_list.amount / fixed_amount：行级总优惠 = 主商品优惠 + option 优惠（与 total 变化一致）
             var mainProductDiscountAmount = amount;
             var lineDiscountAmount = new Decimal(mainProductDiscountAmount).plus(optionDiscountAmount).toNumber();
-            var currentDiscountType = currentSelectedDiscount.tag === 'product_discount_card' ? 'discount_card' : currentSelectedDiscount.tag;
-            var _discountType = selectedDiscount.tag || selectedDiscount.type;
-            var currentIsGoodPass = currentDiscountType === 'good_pass';
+            var discountType = _selectedDiscount.tag || _selectedDiscount.type;
+            var isGoodPass = discountType === 'good_pass';
             var discountDetail = {
               amount: lineDiscountAmount,
-              type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _discountType,
+              type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : discountType,
               discount: {
-                discount_card_type: selectedDiscount === null || selectedDiscount === void 0 || (_selectedDiscount$met = selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
+                discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
                 fixed_amount: lineDiscountAmount,
-                discount_calculation_mode: selectedDiscount === null || selectedDiscount === void 0 || (_selectedDiscount$met2 = selectedDiscount.metadata) === null || _selectedDiscount$met2 === void 0 ? void 0 : _selectedDiscount$met2.discount_calculation_mode,
-                resource_id: selectedDiscount.id,
-                title: selectedDiscount.format_title,
+                discount_calculation_mode: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met2 = _selectedDiscount.metadata) === null || _selectedDiscount$met2 === void 0 ? void 0 : _selectedDiscount$met2.discount_calculation_mode,
+                resource_id: _selectedDiscount.id,
+                title: _selectedDiscount.format_title,
                 original_amount: product.price,
-                product_id: originProduct.id,
-                percent: currentSelectedDiscount.par_value,
-                discount_product_id: currentSelectedDiscount.product_id
+                product_id: originProduct.id || originProduct.product_id,
+                percent: (_reapplyDiscountPerce = reapplyDiscountPercent) !== null && _reapplyDiscountPerce !== void 0 ? _reapplyDiscountPerce : _selectedDiscount.par_value,
+                discount_product_id: _selectedDiscount.product_id
               },
-              // 前端使用的num数量，为了计算优惠金额（拆分时为1）
-              _num: isNeedSplit ? 1 : product.num,
-              config: currentSelectedDiscount === null || currentSelectedDiscount === void 0 ? void 0 : currentSelectedDiscount.config,
+              // 前端使用的num数量，为了计算优惠金额
+              _num: isGoodPass ? 1 : product.num,
+              config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
               metadata: _objectSpread(_objectSpread({
                 num: 1,
-                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag
+                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               }), {}, {
@@ -1442,7 +1465,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               })
             };
             appliedProducts.push(discountDetail);
-            appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
+            appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
 
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
@@ -1450,7 +1473,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
                 // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
-                price: currentIsGoodPass ? mainProductSellingPrice : product.price,
+                price: isGoodPass ? mainProductSellingPrice : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: getProductOriginTotalPrice({
                   product: {
@@ -1467,8 +1490,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion').concat([discountDetail]),
-                _id: product._id.split('___')[0] + '___' + currentSelectedDiscount.id + '_' + i + '_' + index,
-                price: currentIsGoodPass ? 0 : product.price,
+                _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
+                price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 total: _total2,
                 origin_total: productOriginTotal,
@@ -1479,69 +1502,57 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           processedProductsMap.set(product._id, arr);
         } else {
-          // 🔥 bundle子商品：支持拆分（商品券和折扣卡在 applicableProductLimit > 0 时都需要拆分）
+          // 🔥 bundle子商品：支持拆分
           var processedItems = [];
           if (isNeedSplit) {
-            // 需要拆分数量（商品券或折扣卡有 applicableProductLimit 限制）
+            // 商品券：需要拆分数量
             var discountNum = splitCount;
             var normalNum = totalQuantity - discountNum;
 
-            // 生成有折扣的商品（每个拆分商品 num: 1）
+            // 生成有折扣的商品（每张商品券对应 num: 1）
             for (var _i = 0; _i < discountNum; _i++) {
-              var _currentBundleDiscoun, _currentBundleDiscoun2;
-              // 商品券：每个拆分商品使用不同的商品券
-              // 折扣卡：所有拆分商品使用同一张折扣卡
-              var currentBundleDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[_i] : selectedDiscountCard || applicableDiscounts[0];
-              usedDiscounts.set(currentBundleDiscount.id, true);
+              var _selectedDiscount2$me;
+              var _selectedDiscount2 = applicableDiscounts[_i];
+              usedDiscounts.set(_selectedDiscount2.id, true);
               // 🔥 更新 product_id 使用计数
-              if ((currentBundleDiscount.tag || currentBundleDiscount.type) === 'good_pass') {
-                var _currentCount = usedProductIdCounts.get(currentBundleDiscount.product_id) || 0;
-                usedProductIdCounts.set(currentBundleDiscount.product_id, _currentCount + 1);
-              }
-              // 🔥 更新折扣卡 applicableProductLimit 使用计数（跨商品全局）
-              var bundleDiscountTypeForCount = currentBundleDiscount.tag || currentBundleDiscount.type;
-              if (['discount_card', 'product_discount_card'].includes(bundleDiscountTypeForCount)) {
-                var currentBundleLimitCount = usedDiscountCardLimitCounts.get(currentBundleDiscount.id) || 0;
-                usedDiscountCardLimitCounts.set(currentBundleDiscount.id, currentBundleLimitCount + 1);
+              if ((_selectedDiscount2.tag || _selectedDiscount2.type) === 'good_pass') {
+                var _currentCount = usedProductIdCounts.get(_selectedDiscount2.product_id) || 0;
+                usedProductIdCounts.set(_selectedDiscount2.product_id, _currentCount + 1);
               }
 
               // 🔥 生成唯一的 _id
               var uniqueId = "".concat(flatItem._id, "_split_").concat(_i);
 
               // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
-              var discountedPrice = getDiscountAmount(currentBundleDiscount, product.origin_total, product.origin_total);
+              var discountedPrice = getDiscountAmount(_selectedDiscount2, product.origin_total, product.origin_total);
               var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
-
-              // 确定折扣类型
-              var bundleDiscountType = currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : currentBundleDiscount.tag;
+              debugger;
               var _discountDetail = {
                 amount: bundleDiscountAmount,
-                type: bundleDiscountType,
+                type: 'good_pass',
                 discount: {
-                  discount_card_type: currentBundleDiscount === null || currentBundleDiscount === void 0 || (_currentBundleDiscoun = currentBundleDiscount.metadata) === null || _currentBundleDiscoun === void 0 ? void 0 : _currentBundleDiscoun.discount_card_type,
-                  discount_calculation_mode: currentBundleDiscount === null || currentBundleDiscount === void 0 || (_currentBundleDiscoun2 = currentBundleDiscount.metadata) === null || _currentBundleDiscoun2 === void 0 ? void 0 : _currentBundleDiscoun2.discount_calculation_mode,
-                  fixed_amount: bundleDiscountAmount,
-                  resource_id: currentBundleDiscount.id,
-                  title: currentBundleDiscount.format_title,
+                  fixed_amount: product.origin_total,
+                  discount_calculation_mode: _selectedDiscount2 === null || _selectedDiscount2 === void 0 || (_selectedDiscount2$me = _selectedDiscount2.metadata) === null || _selectedDiscount2$me === void 0 ? void 0 : _selectedDiscount2$me.discount_calculation_mode,
+                  resource_id: _selectedDiscount2.id,
+                  title: _selectedDiscount2.format_title,
                   original_amount: product.origin_total,
-                  product_id: product.id,
-                  percent: currentBundleDiscount.par_value,
-                  discount_product_id: currentBundleDiscount.product_id
+                  product_id: product.id || product.product_id,
+                  discount_product_id: _selectedDiscount2.product_id
                 },
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
-                  discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
+                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
-                config: currentBundleDiscount === null || currentBundleDiscount === void 0 ? void 0 : currentBundleDiscount.config
+                config: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.config
               };
 
               // 记录实际应用的折扣
-              var _appliedProducts = appliedDiscountProducts.get(currentBundleDiscount.id) || [];
+              var _appliedProducts = appliedDiscountProducts.get(_selectedDiscount2.id) || [];
               _appliedProducts.push(_discountDetail);
-              appliedDiscountProducts.set(currentBundleDiscount.id, _appliedProducts);
+              appliedDiscountProducts.set(_selectedDiscount2.id, _appliedProducts);
               processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
                 // 🔥 使用唯一的 _id
                 _id: uniqueId,
@@ -1552,263 +1563,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 total: discountedPrice,
                 discount_list: [_discountDetail],
                 processed: true,
-                _discountId: currentBundleDiscount.id
+                _discountId: _selectedDiscount2.id
               }));
             }
 
-            // 🔥 对拆分后的剩余商品继续匹配其他可用折扣（而不是等到下次执行才应用）
-            var remainingNum = normalNum;
-            var continueSplitIndex = discountNum;
-            while (remainingNum > 0) {
-              var _nextSelectedDiscount;
-              // 重新查找适用于剩余商品的可用折扣（已使用的会被自动过滤掉）
-              var nextApplicableDiscounts = sortedDiscountList.filter(function (nextDiscount) {
-                var _product$discount_lis10;
-                var nextDiscountType = nextDiscount.tag || nextDiscount.type;
-                // 检查策略可用性
-                if (['good_pass', 'discount_card', 'product_discount_card'].includes(nextDiscountType)) {
-                  var _nextDiscount$config;
-                  if (nextDiscount.config === undefined || !(nextDiscount !== null && nextDiscount !== void 0 && (_nextDiscount$config = nextDiscount.config) !== null && _nextDiscount$config !== void 0 && _nextDiscount$config.isAvailable)) {
-                    return false;
-                  }
-                }
-                // 折扣卡时总价为0时不可用
-                if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.find(function (n) {
-                  var _n$discount2;
-                  return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === nextDiscount.id;
-                })) && nextDiscountType !== 'good_pass') return false;
-
-                // 商品券已被使用则跳过
-                if (usedDiscounts.get(nextDiscount.id) && nextDiscountType === 'good_pass') return false;
-
-                // 检查 maxUsagePerOrder 限制
-                if (nextDiscountType === 'good_pass') {
-                  var _nextDiscount$config2;
-                  var maxUsagePerOrder = (_nextDiscount$config2 = nextDiscount.config) === null || _nextDiscount$config2 === void 0 ? void 0 : _nextDiscount$config2.maxUsagePerOrder;
-                  if (maxUsagePerOrder && maxUsagePerOrder > 0) {
-                    var currentUsedCount = usedProductIdCounts.get(nextDiscount.product_id) || 0;
-                    if (currentUsedCount >= maxUsagePerOrder) {
-                      return false;
-                    }
-                  }
-                }
-
-                // 检查折扣卡的 applicableProductLimit 限制
-                if (['discount_card', 'product_discount_card'].includes(nextDiscountType)) {
-                  var _nextDiscount$config3;
-                  var limitConfig = ((_nextDiscount$config3 = nextDiscount.config) === null || _nextDiscount$config3 === void 0 ? void 0 : _nextDiscount$config3.applicableProductLimit) || 0;
-                  if (limitConfig > 0) {
-                    var currentUsedLimitCount = usedDiscountCardLimitCounts.get(nextDiscount.id) || 0;
-                    if (currentUsedLimitCount >= limitConfig) {
-                      return false;
-                    }
-                  }
-                }
-                var limitedData = nextDiscount.limited_relation_product_data;
-                if (limitedData.type === 'product_all') {
-                  if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
-                    return false;
-                  }
-                  if (!_this3.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
-                    return false;
-                  }
-                  return true;
-                } else if (limitedData.product_ids && limitedData.product_ids.includes(product.id)) {
-                  if (!_this3.checkPackageSubItemUsageRules(nextDiscount, flatItem)) {
-                    return false;
-                  }
-                  return true;
-                }
-                return false;
-              });
-
-              // 没有更多可用折扣，剩余商品无折扣存储
-              if (nextApplicableDiscounts.length === 0) {
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: "".concat(flatItem._id, "_split_rest"),
-                  num: remainingNum,
-                  quantity: remainingNum,
-                  discount_list: [],
-                  processed: true
-                }));
-                break;
-              }
-
-              // 选择最优折扣
-              var nextSelectedDiscountCard = nextApplicableDiscounts.find(function (n) {
-                return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
-              });
-              var nextSelectedDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
-
-              // 判断新折扣是否需要拆分
-              var nextDiscType = nextSelectedDiscount.tag || nextSelectedDiscount.type;
-              var nextIsGoodPass = nextDiscType === 'good_pass';
-              var nextIsDiscountCard = ['discount_card', 'product_discount_card'].includes(nextDiscType);
-              var nextApplicableProductLimit = ((_nextSelectedDiscount = nextSelectedDiscount.config) === null || _nextSelectedDiscount === void 0 ? void 0 : _nextSelectedDiscount.applicableProductLimit) || 0;
-              var nextIsNeedSplit = nextIsGoodPass || nextIsDiscountCard && nextApplicableProductLimit > 0;
-              if (!nextIsNeedSplit) {
-                var _nextBundleDiscount$m, _flatItem$parentProdu9;
-                // 🔥 不需要拆分：直接应用折扣到所有剩余商品
-                var nextBundleDiscount = nextSelectedDiscountCard || nextApplicableDiscounts[0];
-                usedDiscounts.set(nextBundleDiscount.id, true);
-                if ((nextBundleDiscount.tag || nextBundleDiscount.type) === 'good_pass') {
-                  var curCount = usedProductIdCounts.get(nextBundleDiscount.product_id) || 0;
-                  usedProductIdCounts.set(nextBundleDiscount.product_id, curCount + 1);
-                }
-                var nextNoSplitType = nextBundleDiscount.tag || nextBundleDiscount.type;
-                if (['discount_card', 'product_discount_card'].includes(nextNoSplitType)) {
-                  var _curCount = usedDiscountCardLimitCounts.get(nextBundleDiscount.id) || 0;
-                  usedDiscountCardLimitCounts.set(nextBundleDiscount.id, _curCount + remainingNum);
-                }
-                var nextOriginTotal = product.original_price || product.price || 0;
-                var nextTargetTotal = getDiscountAmount(nextBundleDiscount, nextOriginTotal, nextOriginTotal);
-                var nextDiscountAmount = new Decimal(nextOriginTotal).minus(nextTargetTotal).toNumber();
-                var nextUniqueId = "".concat(flatItem._id, "_split_").concat(continueSplitIndex);
-                var nextBundleDiscType = nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : nextBundleDiscount.tag;
-                var nextDiscountDetail = {
-                  amount: nextDiscountAmount * remainingNum,
-                  type: nextBundleDiscType,
-                  discount: {
-                    discount_card_type: nextBundleDiscount === null || nextBundleDiscount === void 0 || (_nextBundleDiscount$m = nextBundleDiscount.metadata) === null || _nextBundleDiscount$m === void 0 ? void 0 : _nextBundleDiscount$m.discount_card_type,
-                    fixed_amount: nextDiscountAmount,
-                    resource_id: nextBundleDiscount.id,
-                    title: nextBundleDiscount.format_title,
-                    original_amount: product.original_price,
-                    product_id: product.id,
-                    percent: nextBundleDiscount.par_value,
-                    discount_product_id: nextBundleDiscount.product_id
-                  },
-                  metadata: {
-                    custom_product_bundle_map_id: nextUniqueId,
-                    num: remainingNum
-                  },
-                  config: nextBundleDiscount === null || nextBundleDiscount === void 0 ? void 0 : nextBundleDiscount.config,
-                  _num: remainingNum * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
-                };
-                var nextAppliedProducts = appliedDiscountProducts.get(nextBundleDiscount.id) || [];
-                nextAppliedProducts.push(nextDiscountDetail);
-                appliedDiscountProducts.set(nextBundleDiscount.id, nextAppliedProducts);
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: nextUniqueId,
-                  num: remainingNum,
-                  quantity: remainingNum,
-                  total: nextTargetTotal,
-                  price: new Decimal(nextOriginTotal || 0).minus(nextDiscountDetail.discount.fixed_amount).toNumber(),
-                  discount_list: [nextDiscountDetail],
-                  processed: true
-                }));
-                remainingNum = 0;
-                break;
-              }
-
-              // 🔥 需要拆分：计算最大使用次数
-              var nextMaxUsageLimit = void 0;
-              if (nextIsGoodPass) {
-                var _nextSelectedDiscount2;
-                var nextGoodPassCount = nextApplicableDiscounts.filter(function (item) {
-                  return (item.tag || item.type) === 'good_pass';
-                }).length;
-                nextMaxUsageLimit = nextGoodPassCount;
-                if ((_nextSelectedDiscount2 = nextSelectedDiscount.config) !== null && _nextSelectedDiscount2 !== void 0 && _nextSelectedDiscount2.maxUsagePerOrder) {
-                  var usedCount = usedProductIdCounts.get(nextSelectedDiscount.product_id) || 0;
-                  nextMaxUsageLimit = Math.min(nextGoodPassCount, Math.max(0, nextSelectedDiscount.config.maxUsagePerOrder - usedCount));
-                }
-              } else if (nextIsDiscountCard && nextApplicableProductLimit > 0) {
-                var _usedLimitCount = usedDiscountCardLimitCounts.get(nextSelectedDiscount.id) || 0;
-                nextMaxUsageLimit = Math.max(0, nextApplicableProductLimit - _usedLimitCount);
-              } else {
-                nextMaxUsageLimit = 1;
-              }
-              var nextSplitCount = Math.min(remainingNum, nextMaxUsageLimit);
-              if (nextSplitCount === 0) {
-                // 已达使用上限，剩余商品无折扣存储
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: "".concat(flatItem._id, "_split_rest"),
-                  num: remainingNum,
-                  quantity: remainingNum,
-                  discount_list: [],
-                  processed: true
-                }));
-                break;
-              }
-
-              // 生成有折扣的商品
-              for (var j = 0; j < nextSplitCount; j++) {
-                var _nextBundleDiscount$m2;
-                var _nextBundleDiscount = nextIsGoodPass ? nextSelectedDiscountCard || nextApplicableDiscounts[j] : nextSelectedDiscountCard || nextApplicableDiscounts[0];
-                usedDiscounts.set(_nextBundleDiscount.id, true);
-                if ((_nextBundleDiscount.tag || _nextBundleDiscount.type) === 'good_pass') {
-                  var _curCount2 = usedProductIdCounts.get(_nextBundleDiscount.product_id) || 0;
-                  usedProductIdCounts.set(_nextBundleDiscount.product_id, _curCount2 + 1);
-                }
-                var nextBundleDiscTypeForCount = _nextBundleDiscount.tag || _nextBundleDiscount.type;
-                if (['discount_card', 'product_discount_card'].includes(nextBundleDiscTypeForCount)) {
-                  var curLimitCount = usedDiscountCardLimitCounts.get(_nextBundleDiscount.id) || 0;
-                  usedDiscountCardLimitCounts.set(_nextBundleDiscount.id, curLimitCount + 1);
-                }
-                var _nextUniqueId = "".concat(flatItem._id, "_split_").concat(continueSplitIndex);
-                var nextDiscountedPrice = getDiscountAmount(_nextBundleDiscount, product.origin_total, product.origin_total);
-                var nextBundleDiscAmount = new Decimal(product.origin_total || 0).minus(nextDiscountedPrice).toNumber();
-                var nextBundleDiscTypeStr = _nextBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : _nextBundleDiscount.tag;
-                var _nextDiscountDetail = {
-                  amount: nextBundleDiscAmount,
-                  type: nextBundleDiscTypeStr,
-                  discount: {
-                    discount_card_type: _nextBundleDiscount === null || _nextBundleDiscount === void 0 || (_nextBundleDiscount$m2 = _nextBundleDiscount.metadata) === null || _nextBundleDiscount$m2 === void 0 ? void 0 : _nextBundleDiscount$m2.discount_card_type,
-                    fixed_amount: nextBundleDiscAmount,
-                    resource_id: _nextBundleDiscount.id,
-                    title: _nextBundleDiscount.format_title,
-                    original_amount: product.origin_total,
-                    product_id: product.id,
-                    percent: _nextBundleDiscount.par_value,
-                    discount_product_id: _nextBundleDiscount.product_id
-                  },
-                  metadata: {
-                    custom_product_bundle_map_id: _nextUniqueId,
-                    num: 1
-                  },
-                  _num: 1,
-                  config: _nextBundleDiscount === null || _nextBundleDiscount === void 0 ? void 0 : _nextBundleDiscount.config
-                };
-                var _nextAppliedProducts = appliedDiscountProducts.get(_nextBundleDiscount.id) || [];
-                _nextAppliedProducts.push(_nextDiscountDetail);
-                appliedDiscountProducts.set(_nextBundleDiscount.id, _nextAppliedProducts);
-                processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-                  _id: _nextUniqueId,
-                  num: 1,
-                  quantity: 1,
-                  price: nextDiscountedPrice,
-                  total: nextDiscountedPrice,
-                  discount_list: [_nextDiscountDetail],
-                  processed: true,
-                  _discountId: _nextBundleDiscount.id
-                }));
-                continueSplitIndex++;
-              }
-              remainingNum -= nextSplitCount;
+            // 生成无折扣的商品（剩余数量）
+            if (normalNum > 0) {
+              processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
+                // 🔥 为剩余商品生成唯一的 _id
+                _id: "".concat(flatItem._id, "_split_rest"),
+                num: normalNum,
+                quantity: normalNum,
+                discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion'),
+                processed: true
+              }));
             }
           } else {
-            var _currentBundleDiscoun3, _currentBundleDiscoun4, _flatItem$parentProdu10;
-            // 不拆分：直接应用折扣
-            var _currentBundleDiscount = selectedDiscountCard || applicableDiscounts[0];
-            usedDiscounts.set(_currentBundleDiscount.id, true);
-            // 🔥 更新 product_id 使用计数
-            if ((_currentBundleDiscount.tag || _currentBundleDiscount.type) === 'good_pass') {
-              var _currentCount2 = usedProductIdCounts.get(_currentBundleDiscount.product_id) || 0;
-              usedProductIdCounts.set(_currentBundleDiscount.product_id, _currentCount2 + 1);
-            }
-            // 🔥 更新折扣卡 applicableProductLimit 使用计数（不拆分时按商品数量计数）
-            var noSplitDiscountType = _currentBundleDiscount.tag || _currentBundleDiscount.type;
-            if (['discount_card', 'product_discount_card'].includes(noSplitDiscountType)) {
-              var bundleQuantity = product.num || 1;
-              var currentNoSplitCount = usedDiscountCardLimitCounts.get(_currentBundleDiscount.id) || 0;
-              usedDiscountCardLimitCounts.set(_currentBundleDiscount.id, currentNoSplitCount + bundleQuantity);
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
+            // 折扣卡：不拆分数量，直接应用
+            var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
+            usedDiscounts.set(_selectedDiscount3.id, true);
+            // 🔥 更新 product_id 使用计数（虽然此处主要是折扣卡，但保持一致性）
+            if ((_selectedDiscount3.tag || _selectedDiscount3.type) === 'good_pass') {
+              var _currentCount2 = usedProductIdCounts.get(_selectedDiscount3.product_id) || 0;
+              usedProductIdCounts.set(_selectedDiscount3.product_id, _currentCount2 + 1);
             }
             var _productOriginTotal = product.original_price || product.price || 0;
 
             // 🔥 检查是否是 order_level 固定金额折扣卡
-            var _isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
-            var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
+            var _isOrderLevel = isOrderLevelFixedAmountDiscount(_selectedDiscount3);
+            var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(_selectedDiscount3.id) : null;
             var _productAllocation = _orderLevelAllocation === null || _orderLevelAllocation === void 0 ? void 0 : _orderLevelAllocation.get(flatItem._id);
             var targetProductTotal;
             var fixedAmountPerItem;
@@ -1820,45 +1604,43 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
             } else {
               // item_level 或其他类型：使用原有逻辑
-              targetProductTotal = getDiscountAmount(_currentBundleDiscount, _productOriginTotal, _productOriginTotal);
+              targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
               fixedAmountPerItem = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
             }
 
-            // 计算实际折扣金额
-            var bundleActualDiscountAmount = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
-
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
+            debugger;
             var _discountDetail2 = {
-              amount: bundleActualDiscountAmount * (product.num || 1),
-              type: _currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : _currentBundleDiscount.tag,
+              amount: fixedAmountPerItem * (product.num || 1),
+              type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
               discount: {
-                discount_card_type: _currentBundleDiscount === null || _currentBundleDiscount === void 0 || (_currentBundleDiscoun3 = _currentBundleDiscount.metadata) === null || _currentBundleDiscoun3 === void 0 ? void 0 : _currentBundleDiscoun3.discount_card_type,
-                fixed_amount: bundleActualDiscountAmount,
-                discount_calculation_mode: _currentBundleDiscount === null || _currentBundleDiscount === void 0 || (_currentBundleDiscoun4 = _currentBundleDiscount.metadata) === null || _currentBundleDiscoun4 === void 0 ? void 0 : _currentBundleDiscoun4.discount_calculation_mode,
-                resource_id: _currentBundleDiscount.id,
-                title: _currentBundleDiscount.format_title,
+                discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
+                fixed_amount: fixedAmountPerItem,
+                discount_calculation_mode: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me2 = _selectedDiscount3.metadata) === null || _selectedDiscount3$me2 === void 0 ? void 0 : _selectedDiscount3$me2.discount_calculation_mode,
+                resource_id: _selectedDiscount3.id,
+                title: _selectedDiscount3.format_title,
                 original_amount: product.original_price,
-                product_id: product.id,
-                percent: _currentBundleDiscount.par_value,
-                discount_product_id: _currentBundleDiscount.product_id
+                product_id: product.id || product.product_id,
+                percent: _selectedDiscount3.par_value,
+                discount_product_id: _selectedDiscount3.product_id
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
-                discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
               }),
-              config: _currentBundleDiscount === null || _currentBundleDiscount === void 0 ? void 0 : _currentBundleDiscount.config,
-              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.num) || 1)
+              config: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.config,
+              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
             };
 
             // 记录实际应用的折扣
-            var _appliedProducts2 = appliedDiscountProducts.get(_currentBundleDiscount.id) || [];
+            var _appliedProducts2 = appliedDiscountProducts.get(_selectedDiscount3.id) || [];
             _appliedProducts2.push(_discountDetail2);
-            appliedDiscountProducts.set(_currentBundleDiscount.id, _appliedProducts2);
+            appliedDiscountProducts.set(_selectedDiscount3.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
@@ -1986,7 +1768,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       product_id: bundleItem.product_id,
                       price: item.price,
                       num: item.num,
-                      quantity: item.num,
                       discount_list: updatedDiscountList
                     }));
                   });
@@ -2010,7 +1791,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       product_id: bundleItem.product_id,
                       price: item.price,
                       num: item.num,
-                      quantity: item.num,
                       discount_list: _updatedDiscountList
                     }));
                   } else {
@@ -2025,8 +1805,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 更新主商品自己的 discount_list 中的 num（quantity=1）
               var updatedMainDiscountList = mainProductData.discount_list.map(function (discount) {
-                var _discount$metadata7, _discount$metadata8;
-                if (discount !== null && discount !== void 0 && (_discount$metadata7 = discount.metadata) !== null && _discount$metadata7 !== void 0 && _discount$metadata7.custom_product_bundle_map_id) {
+                var _discount$metadata6, _discount$metadata7;
+                if (discount !== null && discount !== void 0 && (_discount$metadata6 = discount.metadata) !== null && _discount$metadata6 !== void 0 && _discount$metadata6.custom_product_bundle_map_id) {
                   // bundle的discount_list保持不变
                   return discount;
                 }
@@ -2034,7 +1814,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, discount), {}, {
                   // num: 1,
                   metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
-                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata8 = discount.metadata) === null || _discount$metadata8 === void 0 ? void 0 : _discount$metadata8.custom_product_bundle_map_id,
+                    custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata7 = discount.metadata) === null || _discount$metadata7 === void 0 ? void 0 : _discount$metadata7.custom_product_bundle_map_id,
                     num: 1
                   })
                 });
@@ -2099,8 +1879,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 更新主商品自己的 discount_list 中的 num（quantity=原quantity-1）
                 var updatedMainDiscountListOriginal = mainProductData.discount_list.map(function (discount) {
-                  var _discount$metadata9, _discount$metadata10;
-                  if (discount !== null && discount !== void 0 && (_discount$metadata9 = discount.metadata) !== null && _discount$metadata9 !== void 0 && _discount$metadata9.custom_product_bundle_map_id) {
+                  var _discount$metadata8, _discount$metadata9;
+                  if (discount !== null && discount !== void 0 && (_discount$metadata8 = discount.metadata) !== null && _discount$metadata8 !== void 0 && _discount$metadata8.custom_product_bundle_map_id) {
                     // bundle的discount_list保持不变
                     return discount;
                   }
@@ -2108,7 +1888,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread(_objectSpread({}, discount), {}, {
                     metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                       num: mainProductQuantity - 1,
-                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
+                      custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata9 = discount.metadata) === null || _discount$metadata9 === void 0 ? void 0 : _discount$metadata9.custom_product_bundle_map_id
                     })
                     // num: mainProductQuantity - 1,
                   });
@@ -2158,7 +1938,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -2173,13 +1953,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
+                        var _item$price, _ref14, _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;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                          var _discount$metadata11;
+                          var _discount$metadata10;
                           return _objectSpread(_objectSpread({}, discount), {}, {
                             metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                               num: item.num,
-                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata11 = discount.metadata) === null || _discount$metadata11 === void 0 ? void 0 : _discount$metadata11.custom_product_bundle_map_id
+                              custom_product_bundle_map_id: discount === null || discount === void 0 || (_discount$metadata10 = discount.metadata) === null || _discount$metadata10 === void 0 ? void 0 : _discount$metadata10.custom_product_bundle_map_id
                             })
                             // num: item.num, // 使用拆分后的 num
                           });
@@ -2187,18 +1970,20 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                         newBundle.push(_objectSpread(_objectSpread({}, bundleItem), {}, {
                           _id: item._id,
                           product_id: bundleItem.product_id,
-                          price: item.price,
+                          price: nextBundlePrice,
                           num: item.num,
                           discount_list: updatedDiscountList,
-                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? item.price : undefined
+                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? nextBundleSellingPrice : undefined
                         }));
                       });
                     }
                   });
                 }
 
-                // 🔥 重新计算主商品的总价（包含bundle）
-                var newTotal = Number(mainProductData.price || 0);
+                // 主商品已经在前面的 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 newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
                 // 判断是否是手动折扣
@@ -2212,25 +1997,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   newTotal = (_mainProductData$tota = mainProductData.total) !== null && _mainProductData$tota !== void 0 ? _mainProductData$tota : newTotal;
                   newOriginTotal = (_mainProductData$orig3 = mainProductData.origin_total) !== null && _mainProductData$orig3 !== void 0 ? _mainProductData$orig3 : newOriginTotal;
                 } else {
-                  // 不是手动折扣时，才重新计算
-                  var _mainDiscountList = mainProductData.discount_list.filter(function (item) {
-                    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$toNumb3, _mainProductData$orig4;
-                    var _allDiscountAmount2 = getDiscountListAmount(_mainDiscountList);
-                    newTotal = (_Decimal$minus$toNumb3 = new Decimal(mainProductData.price || 0).minus(_allDiscountAmount2).toNumber()) !== null && _Decimal$minus$toNumb3 !== void 0 ? _Decimal$minus$toNumb3 : newTotal;
-                    newOriginTotal = (_mainProductData$orig4 = mainProductData.origin_total) !== null && _mainProductData$orig4 !== void 0 ? _mainProductData$orig4 : newOriginTotal;
-                  }
-
-                  // 累加bundle的价格（只累加一次）
+                  // 累加 bundle 的折后价格（只累加一次）
                   if (newBundle.length > 0) {
+                    newBundle.forEach(function (item) {
+                      var _item$bundle_selling_2;
+                      var bundleSellingPrice = (_item$bundle_selling_2 = item.bundle_selling_price) !== null && _item$bundle_selling_2 !== void 0 ? _item$bundle_selling_2 : item.price;
+                      newTotal += Number(bundleSellingPrice) * Number(item.num);
+                    });
+
+                    // 计算原始总价（不考虑折扣）
                     newBundle.forEach(function (item) {
                       var _item$discount_list3;
-                      newTotal += Number(item.price) * Number(item.num);
                       var originalPrice = ((_item$discount_list3 = item.discount_list) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3[0]) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3.discount) === null || _item$discount_list3 === void 0 ? void 0 : _item$discount_list3.original_amount) || item.price;
                       newOriginTotal += Number(originalPrice) * Number(item.num);
                     });
@@ -2342,6 +2119,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkPackageSubItemUsageRules",
     value: function checkPackageSubItemUsageRules(discount, flatItem) {
+      var _flatItem$product;
       var limitedData = discount.limited_relation_product_data;
       var usageRules = limitedData === null || limitedData === void 0 ? void 0 : limitedData.package_sub_item_usage_rules;
       var rules = ['original_price'].concat(_toConsumableArray((usageRules === null || usageRules === void 0 ? void 0 : usageRules.rules) || []));
@@ -2353,16 +2131,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref14 = packageScope || {},
-        scopeType = _ref14.type,
-        _ref14$exclude_bundle = _ref14.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref14$exclude_bundle === void 0 ? [] : _ref14$exclude_bundle,
-        _ref14$include_bundle = _ref14.include_bundle_product_ids,
-        include_bundle_product_ids = _ref14$include_bundle === void 0 ? [] : _ref14$include_bundle,
-        _ref14$filter = _ref14.filter,
-        filter = _ref14$filter === void 0 ? 0 : _ref14$filter;
+      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 isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
+      var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2375,12 +2154,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu11;
+          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
-          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
+          var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
+          var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
           // 主商品id
-          var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu11 = flatItem.parentProduct) === null || _flatItem$parentProdu11 === void 0 ? void 0 : _flatItem$parentProdu11.id) || 0;
+          var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
           // markup_price 对应：
@@ -2405,13 +2184,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2445,10 +2224,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem11, _flatItem$bundleItem12;
+          var _flatItem$bundleItem12, _flatItem$bundleItem13;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
+          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"
@@ -2461,16 +2240,43 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查 rules
           if (rules.length > 0) {
-            // 检查原价
-            if (_isOriginalPrice2 && rules.includes('original_price')) {
-              return true;
+            var _isOriginalPrice3 = _isOriginalPrice2 && rules.includes('original_price');
+            var _isMarkupPrice3 = _isMarkupPrice2 && rules.includes('markup_price');
+            // 价格是否符合规则：原价或加价
+            var _isPriceValid = _isOriginalPrice3 || _isMarkupPrice3;
+            // 套餐适用范围校验
+            var _isScopeValid = false;
+
+            // 排除套餐判断, product_all值兼容旧数据
+            if (scopeType === 'all_packages' || scopeType === 'product_all') {
+              // 所有套餐可用
+              if (!filter) {
+                _isScopeValid = true;
+              } else {
+                _isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+              }
             }
 
-            // 检查加价
-            if (_isMarkupPrice2 && rules.includes('markup_price')) {
+            // 包含套餐判断, products值兼容旧数据
+            if (scopeType === 'specific_packages' || scopeType === 'products') {
+              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+            }
+
+            // 价格和套餐适用范围都符合，则可用
+            if (_isPriceValid && _isScopeValid) {
               return true;
             }
 
+            // 检查原价
+            // if (isOriginalPrice && rules.includes('original_price')) {
+            //   return true;
+            // }
+
+            // 检查加价
+            // if (isMarkupPrice && rules.includes('markup_price')) {
+            //   return true;
+            // }
+
             // 如果都不匹配，则不可用
             return false;
           }
@@ -2547,6 +2353,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _context3.next = 3;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 3:
+              console.log('[Rules] 已销毁');
+              _get(_getPrototypeOf(RulesModule.prototype), "destroy", this).call(this);
+            case 5:
             case "end":
               return _context3.stop();
           }
@@ -2564,6 +2373,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              console.log('[Rules] clear');
+            case 1:
             case "end":
               return _context4.stop();
           }