@pisell/pisellos 2.3.40 → 2.3.42

package/dist/modules/Product/types.d.ts

@@ -193,7 +193,6 @@ export interface ProductData {
         status?: string;
         required?: number | string | boolean;
         resource_id?: number | string | null;
-        [key: string]: any;
     };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;

package/dist/modules/ProductList/index.js

@@ -157,10 +157,6 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           userPlugin,
           customer_id,
           _userPlugin$get,
-          channelMap,
-          rawApplicationCode,
-          mappedApplicationCode,
-          queryPayload,
           productsData,
           sortedList,
           _args4 = arguments;
@@ -189,16 +185,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 console.error(error);
               }
               // 如果没传schedule_date，则从
-              channelMap = {
-                online_store: 'online-store',
-                scan_to_order: 'online-store',
-                'scan-to-order': 'online-store',
-                scan_to_order_2: 'mobile_order',
-                scan_to_order_3: 'scantoorder3'
-              };
-              rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
-              mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+              _context4.next = 7;
+              return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
                 exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
@@ -206,35 +194,28 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 status: status,
                 num: 500,
                 skip: 1,
-                customer_id: customer_id
-              }, Array.isArray(category_ids) && category_ids.length ? {
-                category_ids: category_ids
-              } : {}), Array.isArray(product_ids) && product_ids.length ? {
-                ids: product_ids
-              } : {}), Array.isArray(collection) && collection.length ? {
-                collection: collection
-              } : {}), {}, {
-                front_end_cache_id: cacheId
-              }, Array.isArray(menu_list_ids) && menu_list_ids.length ? {
-                menu_list_ids: menu_list_ids
-              } : {}), {}, {
+                customer_id: customer_id,
+                category_ids: category_ids,
+                ids: product_ids,
+                collection: collection,
+                front_end_cache_id: cacheId,
+                menu_list_ids: menu_list_ids,
                 with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
-                application_code: mappedApplicationCode,
+                application_code: (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel,
                 is_eject: 1,
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
-                extension_type: extension_type
-              });
-              _context4.next = 11;
-              return this.request.post("/product/query", queryPayload, {
+                extension_type: extension_type,
+                strategy_context: strategy_context
+              }, {
                 osServer: true,
                 callback: options === null || options === void 0 ? void 0 : options.callback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 11:
+            case 7:
               productsData = _context4.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
@@ -247,7 +228,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context4.abrupt("return", sortedList);
-            case 15:
+            case 11:
             case "end":
               return _context4.stop();
           }

package/dist/modules/Quotation/index.d.ts

@@ -21,7 +21,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Quotation/index.js

@@ -90,7 +90,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               res = _context2.sent;
               list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
-                return b.sort - a.sort;
+                return a.sort - b.sort;
               });
               this.store.list = list;
             case 9:
@@ -151,7 +151,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Rules/index.d.ts

@@ -35,6 +35,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
     /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
     resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
+    private isItemRewardProductDiscount;
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -241,6 +241,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
     value: function resolveDiscountListForManualOverride(discountList) {
       return this.excludeDiscountListByType(discountList, 'promotion');
     }
+  }, {
+    key: "isItemRewardProductDiscount",
+    value: function isItemRewardProductDiscount(product) {
+      var _product$_promotion;
+      var discountList = Array.isArray(product === null || product === void 0 ? void 0 : product.discount_list) ? product.discount_list : [];
+      return (product === null || product === void 0 || (_product$_promotion = product._promotion) === null || _product$_promotion === void 0 ? void 0 : _product$_promotion.actionType) === 'ITEM_REWARD' && discountList.some(function (item) {
+        var _item$metadata, _item$metadata2;
+        return (item === null || item === void 0 ? void 0 : item.type) === 'product' && (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.source) === 'promotion' && (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.actionType) === 'ITEM_REWARD';
+      });
+    }
+
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -423,13 +434,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num,
-            booking_id: product.booking_id
+            num: product.num
           });
 
           // 2. 展开 bundle 子商品
           if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
             product.bundle.forEach(function (bundleItem, bundleIndex) {
+              var _ref3, _bundleItem$bundle_pr;
               flattened.push({
                 type: 'bundle',
                 originProduct: originProduct,
@@ -438,8 +449,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundleIndex: bundleIndex,
                 // 虚拟商品属性
                 price: Number(bundleItem.price || 0),
-                id: bundleItem._bundle_product_id,
-                // 🔥 使用 _bundle_product_id
+                id: (_ref3 = (_bundleItem$bundle_pr = bundleItem.bundle_product_id) !== null && _bundleItem$bundle_pr !== void 0 ? _bundleItem$bundle_pr : bundleItem._bundle_product_id) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_id,
                 _id: "".concat(product._id, "_bundle_").concat(bundleIndex),
                 parentId: product._id,
                 num: bundleItem.num || 1,
@@ -448,7 +458,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: bundleItem.booking_id,
+                booking_id: product.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -588,10 +598,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
-        var _ref3, _a$original_price, _ref4, _b$original_price;
+        var _ref4, _a$original_price, _ref5, _b$original_price;
         // 子商品优先使用 original_price，主商品使用 price
-        var priceA = new Decimal(a.type === 'bundle' ? (_ref3 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref3 !== void 0 ? _ref3 : '0' : a.price || '0');
-        var priceB = new Decimal(b.type === 'bundle' ? (_ref4 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : b.price || '0');
+        var priceA = new Decimal(a.type === 'bundle' ? (_ref4 = (_a$original_price = a.original_price) !== null && _a$original_price !== void 0 ? _a$original_price : a.price) !== null && _ref4 !== void 0 ? _ref4 : '0' : a.price || '0');
+        var priceB = new Decimal(b.type === 'bundle' ? (_ref5 = (_b$original_price = b.original_price) !== null && _b$original_price !== void 0 ? _b$original_price : b.price) !== null && _ref5 !== void 0 ? _ref5 : '0' : b.price || '0');
         if (priceA.equals(priceB)) {
           // 价格相同时，主商品优先
           if (a.type !== b.type) {
@@ -730,6 +740,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             startDate: (_flatItem$parentProdu = flatItem.parentProduct) === null || _flatItem$parentProdu === void 0 ? void 0 : _flatItem$parentProdu.startDate
           };
         }
+        if (_this3.isItemRewardProductDiscount(product)) {
+          return false;
+        }
 
         // 编辑的商品使用了优惠券不可用
         var isAvailableProduct = flatItem.type === 'main' ? !((_product2 = product) !== null && _product2 !== void 0 && _product2.booking_id && (_product3 = product) !== null && _product3 !== void 0 && (_product3 = _product3.discount_list) !== null && _product3 !== void 0 && _product3.length && (_product4 = product) !== null && _product4 !== void 0 && (_product4 = _product4.discount_list) !== null && _product4 !== void 0 && _product4.every(function (d) {
@@ -833,7 +846,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref5, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref6, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -861,7 +874,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
-          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref5 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref5 !== void 0 ? _ref5 : 0);
+          var originalAmount = flatItem.type === 'main' ? Number((_product$price = product.price) !== null && _product$price !== void 0 ? _product$price : 0) : Number((_ref6 = (_flatItem$original_pr = flatItem.original_price) !== null && _flatItem$original_pr !== void 0 ? _flatItem$original_pr : flatItem.price) !== null && _ref6 !== void 0 ? _ref6 : 0);
 
           // 传递 parentQuantity 用于差值处理时判断是否是真正的"数量为1"
           var productData = {
@@ -916,6 +929,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           };
           originProduct = flatItem.originProduct;
         }
+        var isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
         addModeDiscount.forEach(function (discount) {
           var _product6, _product7, _product8, _product9, _flatItem$bundleItem3, _flatItem$bundleItem4, _discount$config;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
@@ -941,7 +955,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
+          if (isAvailableProduct && !isItemRewardProductDiscount && isLimitedProduct && timeLimit && isBundleAvailable && (_discount$config = discount.config) !== null && _discount$config !== void 0 && _discount$config.isAvailable) {
             var _discountApplicabilit, _discount$metadata4, _discount$metadata5;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -969,8 +983,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_product_id: discount.product_id
               },
               metadata: {
-                num: num,
-                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
+                num: num
               }
             };
             applicableProducts.push(productData);
@@ -990,13 +1003,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
         var optionDiscountAmount = 0;
         var discountedOptions = options.map(function (option) {
-          var _ref6, _ref7, _option$_original_pri, _ref8, _option$num, _rest$price, _option$_original_pri2;
+          var _ref7, _ref8, _option$_original_pri, _ref9, _option$num, _rest$price, _option$_original_pri2;
           // 折前单价：优先 price，缺失再 add_price；已写回折后价时用 _original_price（或旧字段 _original_add_price）
-          var rawUnit = (_ref6 = (_ref7 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref7 !== void 0 ? _ref7 : option.price) !== null && _ref6 !== void 0 ? _ref6 : option.add_price;
+          var rawUnit = (_ref7 = (_ref8 = (_option$_original_pri = option._original_price) !== null && _option$_original_pri !== void 0 ? _option$_original_pri : option._original_add_price) !== null && _ref8 !== void 0 ? _ref8 : option.price) !== null && _ref7 !== void 0 ? _ref7 : option.add_price;
           var baseUnitNum = Number(rawUnit !== null && rawUnit !== void 0 ? rawUnit : 0);
           if (baseUnitNum <= 0) return option;
           var discountedPrice = getDiscountAmount(discount, baseUnitNum, baseUnitNum);
-          var optQty = Number((_ref8 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref8 !== void 0 ? _ref8 : 1);
+          var optQty = Number((_ref9 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref9 !== void 0 ? _ref9 : 1);
           optionDiscountAmount = new Decimal(optionDiscountAmount).plus(new Decimal(baseUnitNum).minus(discountedPrice).mul(optQty)).toNumber();
           var _original_add_price = option._original_add_price,
             rest = _objectWithoutProperties(option, _excluded);
@@ -1030,9 +1043,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var getOptionTotal = function getOptionTotal(options) {
         if (!(options !== null && options !== void 0 && options.length)) return 0;
         return options.reduce(function (sum, opt) {
-          var _ref9, _opt$price, _ref10, _opt$num;
-          var unit = Number((_ref9 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
-          var n = Number((_ref10 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref10 !== void 0 ? _ref10 : 1);
+          var _ref10, _opt$price, _ref11, _opt$num;
+          var unit = Number((_ref10 = (_opt$price = opt.price) !== null && _opt$price !== void 0 ? _opt$price : opt.add_price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+          var n = Number((_ref11 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref11 !== void 0 ? _ref11 : 1);
           return new Decimal(sum).plus(new Decimal(unit).mul(n)).toNumber();
         }, 0);
       };
@@ -1087,6 +1100,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
         var applicableDiscounts = sortedDiscountList.filter(function (discount) {
           var _product$discount_lis3, _product$discount_lis4;
+          if (_this3.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对 good_pass 和折扣卡）
           var discountType = discount.tag || discount.type;
           var currentOriginUid = getOriginProductUid(originProduct);
@@ -1164,28 +1178,36 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false;
         });
 
-        // 选择第一个适用的优惠券（已经按过期时间排序）
-        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
-        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
-        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+        // 用户显式点击某张折扣卡时，本次选择优先于自动排序和扫码默认选择。
+        // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
+        var explicitlySelectedDiscountCard = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
+          var discountType = discount.tag || discount.type;
+          return String(discount.id) === String(options.discountId) && ['discount_card', 'product_discount_card'].includes(discountType);
+        }) : undefined;
+
+        // 没有显式选择时保持现有行为：扫码且已选中的折扣卡优先，否则使用自动排序第一项。
+        var scannedSelectedDiscountCard = applicableDiscounts.find(function (n) {
           return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
         });
+        var selectedDiscountCard = explicitlySelectedDiscountCard || scannedSelectedDiscountCard;
         var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = false;
+        var isItemRewardProductDiscount = false;
         if (flatItem.type === 'main') {
           var _product$discount_lis5, _product$discount_lis6, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
           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);
+            var _ref12;
+            return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
           }) && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || ((_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) {
+          isItemRewardProductDiscount = _this3.isItemRewardProductDiscount(product);
+          if (product.inPromotion && !isItemRewardProductDiscount) {
             isManualDiscount = false;
           }
         } else {
@@ -1196,8 +1218,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             isManualDiscount = typeof parentProduct.isManualDiscount === 'boolean' ? parentProduct.isManualDiscount : ((_parentProduct$discou = parentProduct.discount_list) === null || _parentProduct$discou === void 0 ? void 0 : _parentProduct$discou.some(function (item) {
               return item.type === 'product';
             })) || parentProduct.total != parentProduct.origin_total && (parentProduct.bundle || []).every(function (item) {
-              var _ref12;
-              return !((_ref12 = item.discount_list || []) !== null && _ref12 !== void 0 && _ref12.length);
+              var _ref13;
+              return !((_ref13 = item.discount_list || []) !== null && _ref13 !== void 0 && _ref13.length);
             }) && (!((_parentProduct$discou2 = parentProduct.discount_list) !== null && _parentProduct$discou2 !== void 0 && _parentProduct$discou2.length) || (parentProduct === null || parentProduct === void 0 || (_parentProduct$discou3 = parentProduct.discount_list) === null || _parentProduct$discou3 === void 0 || (_parentProduct$discou4 = _parentProduct$discou3.every) === null || _parentProduct$discou4 === void 0 ? void 0 : _parentProduct$discou4.call(_parentProduct$discou3, function (item) {
               return item.type === 'product';
             })));
@@ -1290,19 +1312,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref13, _product$_promotion$f, _product13, _product$origin_total;
-              var total = product.inPromotion ? (_ref13 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref13 !== void 0 ? _ref13 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref14, _product$_promotion$f, _product13, _product$origin_total;
+              var total = product.inPromotion ? (_ref14 = (_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 && _ref14 !== void 0 ? _ref14 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = product.price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+              }) || isItemRewardProductDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
                 var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
                 main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price
-              } : {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? _objectSpread({
+                price: product.price,
+                main_product_selling_price: isItemRewardProductDiscount ? main_product_selling_price : product.price
+              }, isItemRewardProductDiscount ? {
+                total: total
+              } : {}) : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
@@ -1454,8 +1479,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               _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
+                num: 1
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               }), {}, {
@@ -1542,7 +1566,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
-                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1,
@@ -1574,7 +1597,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: "".concat(flatItem._id, "_split_rest"),
                 num: normalNum,
                 quantity: normalNum,
-                discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion'),
+                discount_list: [],
                 processed: true
               }));
             }
@@ -1628,7 +1651,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
-                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
@@ -1644,7 +1666,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-              discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
+              discount_list: [_discountDetail2],
               processed: true
             }));
           }
@@ -1754,11 +1776,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   processedItems.forEach(function (item) {
                     // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                     var updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata;
+                      var _item$metadata3;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用拆分后的 num
                       });
@@ -1777,11 +1799,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   if (item.processed) {
                     // 🔥 同样需要更新 discount_list 中的 num
                     var _updatedDiscountList = (item.discount_list || []).map(function (discount) {
-                      var _item$metadata2;
+                      var _item$metadata4;
                       return _objectSpread(_objectSpread({}, discount), {}, {
                         metadata: _objectSpread(_objectSpread({}, discount.metadata), {}, {
                           num: item.num,
-                          custom_product_bundle_map_id: (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.custom_product_bundle_map_id
+                          custom_product_bundle_map_id: (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.custom_product_bundle_map_id
                         })
                         // num: item.num, // 使用当前的 num
                       });
@@ -1822,8 +1844,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 🔥 使用更新后的列表计算折扣金额
               var mainDiscountList = updatedMainDiscountList.filter(function (item) {
-                var _item$metadata3;
-                return !(item !== null && item !== void 0 && (_item$metadata3 = item.metadata) !== null && _item$metadata3 !== void 0 && _item$metadata3.custom_product_bundle_map_id);
+                var _item$metadata5;
+                return !(item !== null && item !== void 0 && (_item$metadata5 = item.metadata) !== null && _item$metadata5 !== void 0 && _item$metadata5.custom_product_bundle_map_id);
               });
               if (mainDiscountList && mainDiscountList.length > 0) {
                 var _Decimal$minus$toNumb, _mainProductData$orig;
@@ -1896,8 +1918,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 🔥 使用更新后的列表计算折扣金额
                 var mainDiscountListOriginal = updatedMainDiscountListOriginal.filter(function (item) {
-                  var _item$metadata4;
-                  return !(item !== null && item !== void 0 && (_item$metadata4 = item.metadata) !== null && _item$metadata4 !== void 0 && _item$metadata4.custom_product_bundle_map_id);
+                  var _item$metadata6;
+                  return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
                 });
                 if (mainDiscountListOriginal && mainDiscountListOriginal.length > 0) {
                   var _Decimal$minus$toNumb2, _mainProductData$orig2;
@@ -1938,7 +1960,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             } else {
               // 🔥 没有子商品被拆分，使用原有逻辑
               mainProductArr.forEach(function (mainProduct) {
-                var _ref15, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
+                var _ref16, _mainProductData$main, _mainProductData$disc, _mainProductData$disc2, _mainProductData$disc3;
                 var mainProductData = _this3.hooks.getProduct(mainProduct);
 
                 // 重组bundle
@@ -1953,9 +1975,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     } else {
                       // 🔥 关键：拆分后的bundle item
                       processedBundleItems.forEach(function (item) {
-                        var _item$price, _ref14, _item$bundle_selling_;
+                        var _item$price, _ref15, _item$bundle_selling_;
                         var nextBundlePrice = (_item$price = item.price) !== null && _item$price !== void 0 ? _item$price : bundleItem.price;
-                        var nextBundleSellingPrice = (_ref14 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref14 !== void 0 ? _ref14 : bundleItem.bundle_selling_price;
+                        var nextBundleSellingPrice = (_ref15 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref15 !== void 0 ? _ref15 : bundleItem.bundle_selling_price;
                         // 🔥 更新 discount_list 中的 num，使其与拆分后的 item.num 一致
                         var updatedDiscountList = (item.discount_list || []).map(function (discount) {
                           var _discount$metadata10;
@@ -1982,7 +2004,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                 // 主商品已经在前面的 setProduct 中应用过折扣；这里只替换 bundle，
                 // 避免把主商品 discount_list 再扣一次。
-                var mainSellingPrice = (_ref15 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref15 !== void 0 ? _ref15 : 0;
+                var mainSellingPrice = (_ref16 = (_mainProductData$main = mainProductData.main_product_selling_price) !== null && _mainProductData$main !== void 0 ? _mainProductData$main : mainProductData.price) !== null && _ref16 !== void 0 ? _ref16 : 0;
                 var newTotal = Number(mainSellingPrice || 0);
                 var newOriginTotal = Number(mainProductData.original_price || mainProductData.price || 0);
 
@@ -2119,7 +2141,6 @@ 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) || []));
@@ -2131,17 +2152,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var ruleType = usageRules.type;
       // 套餐适用范围配置
       var packageScope = usageRules === null || usageRules === void 0 ? void 0 : usageRules.package_scope;
-      var _ref16 = packageScope || {},
-        scopeType = _ref16.type,
-        _ref16$exclude_bundle = _ref16.exclude_bundle_product_ids,
-        exclude_bundle_product_ids = _ref16$exclude_bundle === void 0 ? [] : _ref16$exclude_bundle,
-        _ref16$include_bundle = _ref16.include_bundle_product_ids,
-        include_bundle_product_ids = _ref16$include_bundle === void 0 ? [] : _ref16$include_bundle,
-        _ref16$filter = _ref16.filter,
-        filter = _ref16$filter === void 0 ? 0 : _ref16$filter;
+      var _ref17 = packageScope || {},
+        scopeType = _ref17.type,
+        _ref17$exclude_bundle = _ref17.exclude_bundle_product_ids,
+        exclude_bundle_product_ids = _ref17$exclude_bundle === void 0 ? [] : _ref17$exclude_bundle,
+        _ref17$include_bundle = _ref17.include_bundle_product_ids,
+        include_bundle_product_ids = _ref17$include_bundle === void 0 ? [] : _ref17$include_bundle,
+        _ref17$filter = _ref17.filter,
+        filter = _ref17$filter === void 0 ? 0 : _ref17$filter;
       var isMainProduct = flatItem.type === 'main'; // 单独购买
       var isBundleItem = flatItem.type === 'bundle'; // 套餐中购买
-      var bundleMainProductId = (_flatItem$product = flatItem.product) === null || _flatItem$product === void 0 ? void 0 : _flatItem$product.product_id;
 
       // 主商品直接可用
       if (isMainProduct) {
@@ -2184,13 +2204,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               if (!filter) {
                 isScopeValid = true;
               } else {
-                isScopeValid = !exclude_bundle_product_ids.includes(Number(bundleMainProductId));
+                isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
               }
             }
 
             // 包含套餐判断, products值兼容旧数据
             if (scopeType === 'specific_packages' || scopeType === 'products') {
-              isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
+              isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 
             // 价格和套餐适用范围都符合，则可用
@@ -2240,42 +2260,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 检查 rules
           if (rules.length > 0) {
-            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));
-              }
-            }
-
-            // 包含套餐判断, products值兼容旧数据
-            if (scopeType === 'specific_packages' || scopeType === 'products') {
-              _isScopeValid = include_bundle_product_ids.includes(Number(bundleMainProductId));
-            }
-
-            // 价格和套餐适用范围都符合，则可用
-            if (_isPriceValid && _isScopeValid) {
+            // 检查原价
+            if (_isOriginalPrice2 && rules.includes('original_price')) {
               return true;
             }
 
-            // 检查原价
-            // if (isOriginalPrice && rules.includes('original_price')) {
-            //   return true;
-            // }
-
             // 检查加价
-            // if (isMarkupPrice && rules.includes('markup_price')) {
-            //   return true;
-            // }
+            if (_isMarkupPrice2 && rules.includes('markup_price')) {
+              return true;
+            }
 
             // 如果都不匹配，则不可用
             return false;