@pisell/pisellos 2.1.108 → 2.1.110

package/dist/modules/Rules/index.js

@@ -1,4 +1,8 @@
+var _excluded = ["_original_add_price"],
+  _excluded2 = ["_original_price", "_original_add_price"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -146,7 +150,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       if (productList.every(function (item) {
         var _product$discount_lis;
         var product = _this2.hooks.getProduct(item);
-        return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || (newDiscountList[0].tag === 'good_pass' ? product.price == 0 : product.total == 0));
+        return product.booking_id && (((_product$discount_lis = product.discount_list) === null || _product$discount_lis === void 0 ? void 0 : _product$discount_lis.length) || product.total == 0);
       })) {
         return {
           isAvailable: false,
@@ -301,13 +305,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject,
         orderTotalAmount = _ref2.orderTotalAmount;
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      var isEditModeAddNewProduct = productList.find(function (n) {
-        return n.booking_id;
-      }) && productList.find(function (n) {
-        return !n.booking_id;
-      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -521,6 +518,14 @@ 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;
@@ -570,11 +575,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
             // 转换 sortedFlattenedList 为 Product 格式
             var productsForEvaluate = sortedFlattenedList.map(function (item) {
+              var _item$product;
               return {
                 product_id: item.id,
                 price: item.price || 0,
                 quantity: item.quantity || item.num || 1,
-                selling_price: item.price || 0
+                selling_price: item.price || 0,
+                product_options: item.type === 'main' ? (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.options : undefined
               };
             });
 
@@ -600,8 +607,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       /**
-      // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
-      const sortedProductList = [...productList].sort((a, b) => {
+       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
+       const sortedProductList = [...productList].sort((a, b) => {
         const aProduct = this.hooks.getProduct(a);
         const bProduct = this.hooks.getProduct(b);
         const priceA = new Decimal((aProduct.price as string) || '0');
@@ -850,6 +857,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _flatItem$parentProdu5;
           // bundle子商品：构造虚拟商品对象
           product = {
+            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -858,8 +866,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             total: flatItem.total,
             origin_total: flatItem.origin_total,
             booking_id: flatItem.booking_id,
-            discount_list: flatItem.discount_list || [],
-            startDate: (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate
+            discount_list: flatItem.discount_list || []
           };
           originProduct = flatItem.originProduct;
         }
@@ -929,6 +936,61 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 用于存储扁平化商品处理结果的Map
       var processedFlatItemsMap = new Map();
 
+      // 🔥 Option 折扣辅助函数
+      var applyDiscountToOptions = function applyDiscountToOptions(options, discount) {
+        if (!(options !== null && options !== void 0 && options.length)) return {
+          discountedOptions: options,
+          optionDiscountAmount: 0
+        };
+        var optionDiscountAmount = 0;
+        var discountedOptions = options.map(function (option) {
+          var _ref6, _ref7, _option$_original_pri, _ref8, _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 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);
+          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);
+          var tmpl = (_rest$price = rest.price) !== null && _rest$price !== void 0 ? _rest$price : rest.add_price;
+          var nextPrice = typeof tmpl === 'string' ? String(discountedPrice) : discountedPrice;
+          return _objectSpread(_objectSpread({}, rest), {}, {
+            _original_price: (_option$_original_pri2 = option._original_price) !== null && _option$_original_pri2 !== void 0 ? _option$_original_pri2 : _original_add_price !== undefined ? _original_add_price : rawUnit,
+            price: nextPrice
+          });
+        });
+        return {
+          discountedOptions: discountedOptions,
+          optionDiscountAmount: optionDiscountAmount
+        };
+      };
+      var restoreOptionPrices = function restoreOptionPrices(options) {
+        if (!(options !== null && options !== void 0 && options.length)) return options;
+        return options.map(function (option) {
+          var orig = option._original_price !== undefined ? option._original_price : option._original_add_price;
+          if (orig !== undefined) {
+            var _original_price = option._original_price,
+              _original_add_price = option._original_add_price,
+              rest = _objectWithoutProperties(option, _excluded2);
+            return _objectSpread(_objectSpread({}, rest), {}, {
+              price: orig
+            });
+          }
+          return option;
+        });
+      };
+      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);
+          return new Decimal(sum).plus(new Decimal(unit).mul(n)).toNumber();
+        }, 0);
+      };
+
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
@@ -939,9 +1001,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7, _flatItem$parentProdu6;
+          var _flatItem$parentProdu6, _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7;
           // bundle子商品
           product = {
+            startDate: flatItem === null || flatItem === void 0 || (_flatItem$parentProdu6 = flatItem.parentProduct) === null || _flatItem$parentProdu6 === void 0 ? void 0 : _flatItem$parentProdu6.startDate,
             _id: flatItem._id,
             id: flatItem.id,
             price: flatItem.price,
@@ -951,8 +1014,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             original_price: flatItem === null || flatItem === void 0 || (_flatItem$bundleItem5 = flatItem.bundleItem) === null || _flatItem$bundleItem5 === void 0 ? void 0 : _flatItem$bundleItem5.original_price,
             origin_total: flatItem === null || flatItem === void 0 || (_flatItem$bundleItem6 = flatItem.bundleItem) === null || _flatItem$bundleItem6 === void 0 ? void 0 : _flatItem$bundleItem6.original_price,
             booking_id: flatItem.booking_id,
-            discount_list: (flatItem === null || flatItem === void 0 || (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.discount_list) || [],
-            startDate: (_flatItem$parentProdu6 = flatItem.parentProduct) === null || _flatItem$parentProdu6 === void 0 ? void 0 : _flatItem$parentProdu6.startDate
+            discount_list: (flatItem === null || flatItem === void 0 || (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.discount_list) || []
           };
           originProduct = flatItem.originProduct;
         }
@@ -1022,11 +1084,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }
           }
           var limitedData = discount.limited_relation_product_data;
-          var timeLimit = true;
-          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
-          if (!timeLimit) {
-            return false;
-          }
+
           // 拿到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, {
@@ -1035,6 +1093,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }, holders);
           // 如果 holder 不匹配，则不适用
           if (!isHolderMatch) return false;
+          var timeLimit = true;
+          timeLimit = !!filterDiscountListByBookingTime([discount], (product.startDate || dayjs()).format('YYYY-MM-DD HH:mm:ss')).length;
+          if (!timeLimit) {
+            return false;
+          }
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
@@ -1070,19 +1133,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product12, _product12$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref6;
-            return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
+            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) {
             return item.type === 'product';
           })));
+          if (product.inPromotion) {
+            isManualDiscount = false;
+          }
         } else {
           // 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 _ref7;
-              return !((_ref7 = item.discount_list || []) !== null && _ref7 !== void 0 && _ref7.length);
+              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) {
               return item.type === 'product';
             })));
@@ -1149,7 +1215,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
         if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
           if (flatItem.type === 'main') {
-            // 主商品：保持原有逻辑
+            // 主商品：保持原有逻辑，还原 option 价格
+            var restoredOptions = restoreOptionPrices(product.options);
             if (product.isClient) {
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
                 origin_total: getProductOriginTotalPrice({
@@ -1157,7 +1224,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoredOptions
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: originProduct._productInit.original_price,
@@ -1166,15 +1233,16 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                     price: product.price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoredOptions
                 }),
-                price: product.price
+                price: product.price,
+                options: restoredOptions
               }), {}, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
-              var total = product.inPromotion ? (_ref8 = (_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 && _ref8 !== void 0 ? _ref8 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref13, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
+              var total = product.inPromotion ? (_ref13 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref13 !== void 0 ? _ref13 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
               var main_product_selling_price = (_product$price2 = product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product.main_product_selling_price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
@@ -1189,7 +1257,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
-                main_product_selling_price: main_product_selling_price
+                main_product_selling_price: main_product_selling_price,
+                options: restoredOptions
               }), {}, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
@@ -1248,15 +1317,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (flatItem.type === 'main') {
           // 主商品：保持原有逻辑
           if (splitCount < totalQuantity && isNeedSplit) {
+            var _product$origin_total2;
+            var _total = (_product$origin_total2 = product.origin_total) !== null && _product$origin_total2 !== void 0 ? _product$origin_total2 : product.total;
+            if ((product.discount_list || []).some(function (item) {
+              return item.type === 'promotion';
+            })) {
+              var _product$total2;
+              _total = (_product$total2 = product.total) !== null && _product$total2 !== void 0 ? _product$total2 : product.origin_total;
+            }
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0],
-              total: product.origin_total || product.total
+              total: _total
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct, _currentSelectedDisco, _currentSelectedDisco2;
+            var _originProduct, _selectedDiscount$con2, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
             // 商品券：每个拆分商品使用不同的商品券（从 applicableDiscounts 按索引取）
             // 折扣卡：所有拆分商品使用同一张折扣卡（selectedDiscountCard 或 applicableDiscounts[0]）
             var currentSelectedDiscount = isGoodPass ? selectedDiscountCard || applicableDiscounts[i] : selectedDiscountCard || applicableDiscounts[0];
@@ -1293,33 +1370,50 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
             var orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
             var productAllocation = orderLevelAllocation === null || orderLevelAllocation === void 0 ? void 0 : orderLevelAllocation.get(flatItem._id);
-            var targetProductTotal = void 0;
+            var isDeductOptionPrice = !!((_selectedDiscount$con2 = selectedDiscount.config) !== null && _selectedDiscount$con2 !== void 0 && _selectedDiscount$con2.deductOptionPrice);
+
+            // 主商品折后价（不含 option）；勿与 option 合计混在同一变量，否则 main_product_selling_price 错误
+            var mainProductSellingPrice = void 0;
             var amount = void 0;
             var productDiscountDifference = void 0;
+            var discountedOptions = product.options;
+            var optionDiscountAmount = 0;
             if (isOrderLevel && productAllocation) {
               // order_level：使用预计算的分摊金额
               amount = productAllocation.discountAmount;
               productDiscountDifference = productAllocation.difference;
-              targetProductTotal = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
+              mainProductSellingPrice = Math.max(new Decimal(product.price).minus(amount).toNumber(), 0);
             } else {
               // item_level 或其他类型：使用原有逻辑
-              targetProductTotal = getDiscountAmount(currentSelectedDiscount, product.price, product.price);
-              amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
+              mainProductSellingPrice = getDiscountAmount(currentSelectedDiscount, 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);
+              discountedOptions = optionResult.discountedOptions;
+              optionDiscountAmount = optionResult.optionDiscountAmount;
             }
-            var currentDiscountType = currentSelectedDiscount.tag === 'product_discount_card' ? 'discount_card' : currentSelectedDiscount.tag;
 
-            // 计算实际折扣金额
-            var actualDiscountAmount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
+            // total = 主商品折后 + option 行合计；开启 option 抵扣时必须用 discountedOptions，不能用未折扣的 product.options 再算一遍
+            var optionsForLineTotal = isDeductOptionPrice && (_product$options2 = product.options) !== null && _product$options2 !== void 0 && _product$options2.length ? discountedOptions : product.options;
+            var optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
+            var _total2 = new Decimal(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
+
+            // 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 discountDetail = {
-              amount: actualDiscountAmount,
-              type: currentDiscountType,
+              amount: lineDiscountAmount,
+              type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _discountType,
               discount: {
-                discount_card_type: currentSelectedDiscount === null || currentSelectedDiscount === void 0 || (_currentSelectedDisco = currentSelectedDiscount.metadata) === null || _currentSelectedDisco === void 0 ? void 0 : _currentSelectedDisco.discount_card_type,
-                fixed_amount: actualDiscountAmount,
-                discount_calculation_mode: currentSelectedDiscount === null || currentSelectedDiscount === void 0 || (_currentSelectedDisco2 = currentSelectedDiscount.metadata) === null || _currentSelectedDisco2 === void 0 ? void 0 : _currentSelectedDisco2.discount_calculation_mode,
-                resource_id: currentSelectedDiscount.id,
-                title: currentSelectedDiscount.format_title,
+                discount_card_type: selectedDiscount === null || selectedDiscount === void 0 || (_selectedDiscount$met = selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
+                fixed_amount: lineDiscountAmount,
+                discount_calculation_mode: selectedDiscount === null || selectedDiscount === void 0 || (_selectedDiscount$met2 = selectedDiscount.metadata) === null || _selectedDiscount$met2 === void 0 ? void 0 : _selectedDiscount$met2.discount_calculation_mode,
+                resource_id: selectedDiscount.id,
+                title: selectedDiscount.format_title,
                 original_amount: product.price,
                 product_id: originProduct.id,
                 percent: currentSelectedDiscount.par_value,
@@ -1328,41 +1422,39 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 前端使用的num数量，为了计算优惠金额（拆分时为1）
               _num: isNeedSplit ? 1 : product.num,
               config: currentSelectedDiscount === null || currentSelectedDiscount === void 0 ? void 0 : currentSelectedDiscount.config,
-              metadata: _objectSpread({
+              metadata: _objectSpread(_objectSpread({
                 num: 1,
                 discount_rule_uncheck_flag: selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
+              }), {}, {
+                /** 仅主商品上的优惠金额（不含 option） */
+                mainProductDiscountAmount: mainProductDiscountAmount,
+                optionDiscountAmount: optionDiscountAmount
               })
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(currentSelectedDiscount.id, appliedProducts);
-            var _total = targetProductTotal;
-            if (product.options) {
-              _total = product.options.reduce(function (accumulator, currentValue) {
-                var currentPrice = new Decimal(currentValue.price || 0);
-                var currentNum = new Decimal(currentValue.num || 0);
-                return accumulator.add(currentPrice.mul(currentNum));
-              }, new Decimal(_total)).toNumber();
-            }
 
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: currentIsGoodPass ? product.price - discountDetail.amount : product.price,
+                // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
+                price: currentIsGoodPass ? mainProductSellingPrice : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: getProductOriginTotalPrice({
                   product: {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoreOptionPrices(product.options)
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new Decimal(product.price || 0).toNumber(),
-                total: targetProductTotal
+                total: _total2,
+                options: discountedOptions
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
@@ -1370,9 +1462,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: product._id.split('___')[0] + '___' + currentSelectedDiscount.id + '_' + i + '_' + index,
                 price: currentIsGoodPass ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: targetProductTotal,
+                total: _total2,
                 origin_total: productOriginTotal,
-                main_product_selling_price: targetProductTotal
+                main_product_selling_price: mainProductSellingPrice,
+                options: discountedOptions
               }));
             }
           }
@@ -1709,22 +1802,22 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var _isOrderLevel = isOrderLevelFixedAmountDiscount(selectedDiscount);
             var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount.id) : null;
             var _productAllocation = _orderLevelAllocation === null || _orderLevelAllocation === void 0 ? void 0 : _orderLevelAllocation.get(flatItem._id);
-            var _targetProductTotal;
+            var targetProductTotal;
             var fixedAmountPerItem;
             var _productDiscountDifference;
             if (_isOrderLevel && _productAllocation) {
               // order_level：使用预计算的单价折扣金额（已经是单价，无需再除以数量）
               fixedAmountPerItem = _productAllocation.discountAmount;
               _productDiscountDifference = _productAllocation.difference;
-              _targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
+              targetProductTotal = Math.max(new Decimal(_productOriginTotal).minus(fixedAmountPerItem).toNumber(), 0);
             } else {
               // item_level 或其他类型：使用原有逻辑
-              _targetProductTotal = getDiscountAmount(_currentBundleDiscount, _productOriginTotal, _productOriginTotal);
-              fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
+              targetProductTotal = getDiscountAmount(_currentBundleDiscount, _productOriginTotal, _productOriginTotal);
+              fixedAmountPerItem = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
             }
 
             // 计算实际折扣金额
-            var bundleActualDiscountAmount = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
+            var bundleActualDiscountAmount = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
 
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
@@ -1759,7 +1852,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _appliedProducts2.push(_discountDetail2);
             appliedDiscountProducts.set(_currentBundleDiscount.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-              total: _targetProductTotal,
+              total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
               discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
               processed: true
@@ -1778,8 +1871,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 获取主商品处理结果
           var mainProductArr = processedProductsMap.get(product._id);
           if (!mainProductArr || mainProductArr.length === 0) {
-            // 如果没有处理结果，返回默认商品
+            // 如果没有处理结果，返回默认商品（还原 option 价格）
             var getDefaultProduct = function getDefaultProduct() {
+              var restoredOptions = restoreOptionPrices(product.options);
               if (product.isClient) {
                 return _this3.hooks.setProduct(originProduct, {
                   discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
@@ -1789,7 +1883,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       original_price: product.original_price
                     },
                     bundle: product.bundle,
-                    options: product.options
+                    options: restoredOptions
                   }),
                   variant: originProduct._productInit.variant,
                   original_price: originProduct._productInit.original_price,
@@ -1798,15 +1892,17 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                       price: product.price
                     },
                     bundle: product.bundle,
-                    options: product.options
-                  })
+                    options: restoredOptions
+                  }),
+                  options: restoredOptions
                 });
               } else {
                 return _this3.hooks.setProduct(originProduct, {
                   discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
                   total: product.total,
                   origin_total: product.origin_total,
-                  price: product.price
+                  price: product.price,
+                  options: restoreOptionPrices(product.options)
                 });
               }
             };
@@ -2086,7 +2182,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                           price: item.price,
                           num: item.num,
                           quantity: item.num,
-                          discount_list: updatedDiscountList
+                          discount_list: updatedDiscountList,
+                          bundle_selling_price: bundleItem.bundle_selling_price !== undefined ? item.price : undefined
                         }));
                       });
                     }

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

@@ -67,6 +67,7 @@ export interface RulesParamsHooks {
         quantity?: number;
         bundle?: any[];
         main_product_selling_price?: string | number;
+        options?: any[];
     }) => Record<string, any>;
 }
 export {};

package/dist/solution/BookingByStep/index.d.ts

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -42,7 +42,8 @@ var defaultStrategyMetadataCustom = {
   allowCrossProduct: true,
   applicableProductLimit: 0,
   deductTaxAndFee: true,
-  maxPassesPerItem: 0
+  maxPassesPerItem: 0,
+  deductOptionPrice: false
 };
 var WalletPassEvaluator = class {
   constructor() {

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -43,6 +43,8 @@ export interface Voucher {
         applicableProductLimit: number;
         /** 单订单行每单位可用同一 Wallet Pass 券次数；该行总券次上限 = maxPassesPerItem × 该行 quantity（按行唯一键区分）。0 表示不限制。 */
         maxPassesPerItem: number;
+        /** 是否抵扣单规格价格 (Option Price)，默认 false。开启后折扣范围包含 option 的 add_price */
+        deductOptionPrice: boolean;
     };
 }
 /**
@@ -62,6 +64,13 @@ export interface Product {
     main_product_original_price?: number;
     /** 主商品折扣后金额，不包含套餐子商品 */
     main_product_selling_price?: number;
+    /** 单规格（Option）列表 */
+    product_options?: {
+        id: number;
+        add_price: number | string;
+        num: number;
+        [key: string]: any;
+    }[];
     /** 主商品税费 */
     tax_fee: number;
     metadata: {
@@ -138,6 +147,8 @@ export interface EvaluatorInput {
         applicableProductLimit: number;
         /** 单订单行每单位可用同一 Wallet Pass 券次数；行总上限 = maxPassesPerItem × 该行 quantity（按行唯一键计）。0 表示不限制。 */
         maxPassesPerItem: number;
+        /** 是否抵扣单规格价格 (Option Price)，默认 false */
+        deductOptionPrice: boolean;
     }>[];
 }
 /**