@pisell/pisellos 0.0.568 → 0.0.569

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;
@@ -784,6 +844,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         }
       });
+
       // 🔥 第三步：识别 order_level 折扣卡并预计算分摊（排除被其他专属折扣卡占用的商品）
       sortedDiscountList.forEach(function (discount) {
         if (!isOrderLevelFixedAmountDiscount(discount)) {
@@ -882,7 +943,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;
@@ -925,7 +986,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 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,7 +1061,7 @@ 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, _selectedDiscount$con;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -1024,11 +1085,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isPersistedProduct = ((_product10 = product) === null || _product10 === void 0 ? void 0 : _product10.booking_id) || ((_originProduct = originProduct) === null || _originProduct === void 0 ? void 0 : _originProduct.order_detail_id) || ((_originProduct2 = originProduct) === null || _originProduct2 === void 0 ? void 0 : _originProduct2.orderDetailId) || ((_originProduct3 = originProduct) === null || _originProduct3 === void 0 ? void 0 : _originProduct3.booking_id);
+        var hasExistingWalletDiscount = ((_product$discount_lis2 = product.discount_list) === null || _product$discount_lis2 === void 0 ? void 0 : _product$discount_lis2.length) && ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 ? void 0 : _product11.every(function (discount) {
+          var _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 +1110,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)) {
@@ -1094,7 +1167,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            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 不匹配，则不适用
@@ -1137,12 +1210,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 +1227,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 +1241,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 +1251,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 +1264,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 +1277,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,7 +1322,7 @@ 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;
@@ -1263,26 +1340,26 @@ 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;
         }
 
@@ -1341,7 +1418,7 @@ 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;
+            var _originProduct4, _selectedDiscount$con2, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2, _reapplyDiscountPerce;
             // 商品券：每个拆分商品使用不同的商品券（从 applicableDiscounts 按索引取）
             // 折扣卡：所有拆分商品使用同一张折扣卡（selectedDiscountCard 或 applicableDiscounts[0]）
             var currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
@@ -1369,7 +1446,7 @@ 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;
             }
 
@@ -1386,18 +1463,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,9 +1494,8 @@ 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 currentIsGoodPass = _discountType === 'good_pass';
             var discountDetail = {
               amount: lineDiscountAmount,
               type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _discountType,
@@ -1423,9 +1506,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 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,
@@ -1442,7 +1525,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               })
             };
             appliedProducts.push(discountDetail);
-            appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
+            appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
 
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
@@ -1450,7 +1533,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: {
@@ -1511,6 +1594,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
               var discountedPrice = getDiscountAmount(currentBundleDiscount, product.origin_total, product.origin_total);
               var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
+              debugger;
 
               // 确定折扣类型
               var bundleDiscountType = currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : currentBundleDiscount.tag;
@@ -1524,9 +1608,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   resource_id: currentBundleDiscount.id,
                   title: currentBundleDiscount.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: selectedDiscount.product_id
                 },
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
@@ -1563,7 +1646,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               var _nextSelectedDiscount;
               // 重新查找适用于剩余商品的可用折扣（已使用的会被自动过滤掉）
               var nextApplicableDiscounts = sortedDiscountList.filter(function (nextDiscount) {
-                var _product$discount_lis10;
+                var _product$discount_lis11;
                 var nextDiscountType = nextDiscount.tag || nextDiscount.type;
                 // 检查策略可用性
                 if (['good_pass', 'discount_card', 'product_discount_card'].includes(nextDiscountType)) {
@@ -1573,7 +1656,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   }
                 }
                 // 折扣卡时总价为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) {
+                if ((Number(product.total) <= 0 || !product.total) && !((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.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;
@@ -1829,6 +1912,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
+            debugger;
             var _discountDetail2 = {
               amount: bundleActualDiscountAmount * (product.num || 1),
               type: _currentBundleDiscount.tag === 'product_discount_card' ? 'discount_card' : _currentBundleDiscount.tag,
@@ -1839,9 +1923,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 resource_id: _currentBundleDiscount.id,
                 title: _currentBundleDiscount.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: selectedDiscount.par_value,
+                discount_product_id: selectedDiscount.product_id
               },
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
@@ -2158,7 +2242,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,6 +2257,9 @@ 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;
@@ -2187,18 +2274,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,21 +2301,7 @@ 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$discount_list3;
@@ -2234,6 +2309,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       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);
                     });
+                    // 计算原始总价（不考虑折扣）
+                    newBundle.forEach(function (item) {
+                      var _item$discount_list4;
+                      var originalPrice = ((_item$discount_list4 = item.discount_list) === null || _item$discount_list4 === void 0 || (_item$discount_list4 = _item$discount_list4[0]) === null || _item$discount_list4 === void 0 || (_item$discount_list4 = _item$discount_list4.discount) === null || _item$discount_list4 === void 0 ? void 0 : _item$discount_list4.original_amount) || item.price;
+                      newOriginTotal += Number(originalPrice) * Number(item.num);
+                    });
                   }
                 }
 
@@ -2342,6 +2423,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 +2435,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,10 +2458,10 @@ 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$parentProdu11;
           // 套餐中购买时，判断是否为原价
-          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;
           // original_price 对应：
@@ -2405,13 +2488,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 +2528,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 +2544,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 +2657,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _context3.next = 3;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 3:
+              _get(_getPrototypeOf(RulesModule.prototype), "destroy", this).call(this);
+            case 4:
             case "end":
               return _context3.stop();
           }