@pisell/pisellos 2.2.102 → 2.2.103

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -20,7 +20,8 @@ var defaultStrategyMetadataCustom = {
   allowCrossProduct: true,
   applicableProductLimit: 0,
   deductTaxAndFee: true,
-  maxPassesPerItem: 0
+  maxPassesPerItem: 0,
+  deductOptionPrice: false
 };
 
 /**

package/dist/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;
     }>[];
 }
 /**

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

@@ -119,6 +119,8 @@ export interface Discount {
         allowCrossProduct?: boolean;
         /** 可用商品数量上限 */
         applicableProductLimit?: number;
+        /** 是否抵扣单规格价格 (Option Price) */
+        deductOptionPrice?: boolean;
     };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];

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

@@ -23,7 +23,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private logError;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Rules/index.js

@@ -1,4 +1,7 @@
+var _excluded = ["_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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -485,11 +488,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
               };
             });
 
@@ -826,6 +831,53 @@ 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 _ref5, _option$num, _option$_original_add;
+          var addPrice = Number(option.add_price || 0);
+          if (addPrice <= 0) return option;
+          var discountedPrice = getDiscountAmount(discount, addPrice, addPrice);
+          var optQty = Number((_ref5 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref5 !== void 0 ? _ref5 : 1);
+          optionDiscountAmount = new Decimal(optionDiscountAmount).plus(new Decimal(addPrice).minus(discountedPrice).mul(optQty)).toNumber();
+          return _objectSpread(_objectSpread({}, option), {}, {
+            _original_add_price: (_option$_original_add = option._original_add_price) !== null && _option$_original_add !== void 0 ? _option$_original_add : option.add_price,
+            add_price: discountedPrice
+          });
+        });
+        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) {
+          if (option._original_add_price !== undefined) {
+            var _original_add_price = option._original_add_price,
+              rest = _objectWithoutProperties(option, _excluded);
+            return _objectSpread(_objectSpread({}, rest), {}, {
+              add_price: _original_add_price
+            });
+          }
+          return option;
+        });
+      };
+      var getOptionTotal = function getOptionTotal(options) {
+        if (!(options !== null && options !== void 0 && options.length)) return 0;
+        return options.reduce(function (sum, opt) {
+          var _ref6, _opt$add_price, _ref7, _opt$num;
+          var unit = Number((_ref6 = (_opt$add_price = opt.add_price) !== null && _opt$add_price !== void 0 ? _opt$add_price : opt.price) !== null && _ref6 !== void 0 ? _ref6 : 0);
+          var n = Number((_ref7 = (_opt$num = opt.num) !== null && _opt$num !== void 0 ? _opt$num : opt.quantity) !== null && _ref7 !== void 0 ? _ref7 : 1);
+          return new Decimal(sum).plus(new Decimal(unit).mul(n)).toNumber();
+        }, 0);
+      };
+
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
@@ -955,8 +1007,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis5, _product11, _product11$every;
           // 主商品：判断自身是否手动折扣
           isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (product.bundle || []).every(function (item) {
-            var _ref5;
-            return !((_ref5 = item.discount_list || []) !== null && _ref5 !== void 0 && _ref5.length);
+            var _ref8;
+            return !((_ref8 = item.discount_list || []) !== null && _ref8 !== void 0 && _ref8.length);
           }) && (!((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length) || ((_product11 = product) === null || _product11 === void 0 || (_product11 = _product11.discount_list) === null || _product11 === void 0 || (_product11$every = _product11.every) === null || _product11$every === void 0 ? void 0 : _product11$every.call(_product11, function (item) {
             return item.type === 'product';
           })));
@@ -969,8 +1021,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           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 _ref6;
-              return !((_ref6 = item.discount_list || []) !== null && _ref6 !== void 0 && _ref6.length);
+              var _ref9;
+              return !((_ref9 = item.discount_list || []) !== null && _ref9 !== void 0 && _ref9.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';
             })));
@@ -1037,7 +1089,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({
@@ -1045,7 +1098,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,
@@ -1054,15 +1107,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 _ref7, _product$_promotion$f, _product12, _product$origin_total;
-              var total = product.inPromotion ? (_ref7 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref7 !== void 0 ? _ref7 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var _ref10, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref10 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref10 !== void 0 ? _ref10 : 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';
@@ -1078,7 +1132,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')
               }))]);
@@ -1135,7 +1190,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _originProduct, _selectedDiscount$met, _selectedDiscount$met2;
+            var _originProduct, _selectedDiscount$con, _product$options, _product$options2, _selectedDiscount$met, _selectedDiscount$met2;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -1165,27 +1220,46 @@ 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$con = _selectedDiscount.config) !== null && _selectedDiscount$con !== void 0 && _selectedDiscount$con.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(_selectedDiscount, product.price, product.price);
-              amount = new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber();
+              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, _selectedDiscount);
+              discountedOptions = optionResult.discountedOptions;
+              optionDiscountAmount = optionResult.optionDiscountAmount;
             }
+
+            // 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 discountType = _selectedDiscount.tag || _selectedDiscount.type;
             var isGoodPass = discountType === 'good_pass';
             var discountDetail = {
-              amount: amount,
+              amount: lineDiscountAmount,
               type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : discountType,
               discount: {
                 discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
-                fixed_amount: amount,
+                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,
@@ -1197,40 +1271,38 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
               config: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.config,
-              metadata: _objectSpread({
+              metadata: _objectSpread(_objectSpread({
                 num: 1
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
+              }), {}, {
+                /** 仅主商品上的优惠金额（不含 option） */
+                mainProductDiscountAmount: mainProductDiscountAmount,
+                optionDiscountAmount: optionDiscountAmount
               })
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
-            var _total2 = targetProductTotal;
-            if (product.options) {
-              _total2 = 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(_total2)).toNumber();
-            }
 
             // 记录应用了优惠券的商品
             // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
             if (product.isClient) {
               arr.push(_this3.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
+                // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
+                price: isGoodPass ? 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: _total2
+                total: _total2,
+                options: discountedOptions
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
@@ -1240,7 +1312,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 quantity: isNeedSplit ? 1 : product.quantity,
                 total: _total2,
                 origin_total: productOriginTotal,
-                main_product_selling_price: targetProductTotal
+                main_product_selling_price: mainProductSellingPrice,
+                options: discountedOptions
               }));
             }
           }
@@ -1336,18 +1409,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var _isOrderLevel = isOrderLevelFixedAmountDiscount(_selectedDiscount3);
             var _orderLevelAllocation = _isOrderLevel ? orderLevelDiscountAllocations.get(_selectedDiscount3.id) : null;
             var _productAllocation = _orderLevelAllocation === null || _orderLevelAllocation === void 0 ? void 0 : _orderLevelAllocation.get(flatItem._id);
-            var _targetProductTotal;
+            var 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(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
-              fixedAmountPerItem = new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber();
+              targetProductTotal = getDiscountAmount(_selectedDiscount3, _productOriginTotal, _productOriginTotal);
+              fixedAmountPerItem = new Decimal(_productOriginTotal).minus(targetProductTotal).toNumber();
             }
 
             // 🔥 使用当前的 _id 作为唯一标识
@@ -1382,7 +1455,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _appliedProducts2.push(_discountDetail2);
             appliedDiscountProducts.set(_selectedDiscount3.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
-              total: _targetProductTotal,
+              total: targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
               discount_list: [_discountDetail2],
               processed: true
@@ -1401,8 +1474,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'),
@@ -1412,7 +1486,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,
@@ -1421,15 +1495,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)
                 });
               }
             };

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

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

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;
     }>[];
 }
 /**

package/lib/modules/Discount/types.d.ts

@@ -119,6 +119,8 @@ export interface Discount {
         allowCrossProduct?: boolean;
         /** 可用商品数量上限 */
         applicableProductLimit?: number;
+        /** 是否抵扣单规格价格 (Option Price) */
+        deductOptionPrice?: boolean;
     };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];

package/lib/modules/Order/index.d.ts

@@ -23,7 +23,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private logError;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Rules/index.js

@@ -353,12 +353,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             available_product_type: (_a = discount.limited_relation_product_data) == null ? void 0 : _a.type,
             available_product_ids: (_b = discount.limited_relation_product_data) == null ? void 0 : _b.product_ids
           };
-          const productsForEvaluate = sortedFlattenedList.map((item) => ({
-            product_id: item.id,
-            price: item.price || 0,
-            quantity: item.quantity || item.num || 1,
-            selling_price: item.price || 0
-          }));
+          const productsForEvaluate = sortedFlattenedList.map((item) => {
+            var _a2;
+            return {
+              product_id: item.id,
+              price: item.price || 0,
+              quantity: item.quantity || item.num || 1,
+              selling_price: item.price || 0,
+              product_options: item.type === "main" ? (_a2 = item.product) == null ? void 0 : _a2.options : void 0
+            };
+          });
           const result = evaluator.checkVoucherAvailability({
             orderTotalAmount,
             products: productsForEvaluate,
@@ -584,8 +588,47 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
+    const applyDiscountToOptions = (options2, discount) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return { discountedOptions: options2, optionDiscountAmount: 0 };
+      let optionDiscountAmount = 0;
+      const discountedOptions = options2.map((option) => {
+        const addPrice = Number(option.add_price || 0);
+        if (addPrice <= 0)
+          return option;
+        const discountedPrice = (0, import_utils.getDiscountAmount)(discount, addPrice, addPrice);
+        const optQty = Number(option.num ?? option.quantity ?? 1);
+        optionDiscountAmount = new import_decimal.default(optionDiscountAmount).plus(new import_decimal.default(addPrice).minus(discountedPrice).mul(optQty)).toNumber();
+        return {
+          ...option,
+          _original_add_price: option._original_add_price ?? option.add_price,
+          add_price: discountedPrice
+        };
+      });
+      return { discountedOptions, optionDiscountAmount };
+    };
+    const restoreOptionPrices = (options2) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return options2;
+      return options2.map((option) => {
+        if (option._original_add_price !== void 0) {
+          const { _original_add_price, ...rest } = option;
+          return { ...rest, add_price: _original_add_price };
+        }
+        return option;
+      });
+    };
+    const getOptionTotal = (options2) => {
+      if (!(options2 == null ? void 0 : options2.length))
+        return 0;
+      return options2.reduce((sum, opt) => {
+        const unit = Number(opt.add_price ?? opt.price ?? 0);
+        const n = Number(opt.num ?? opt.quantity ?? 1);
+        return new import_decimal.default(sum).plus(new import_decimal.default(unit).mul(n)).toNumber();
+      }, 0);
+    };
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -784,6 +827,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (flatItem.type === "main") {
+          const restoredOptions = restoreOptionPrices(product.options);
           if (product.isClient) {
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
@@ -793,7 +837,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                       original_price: product.original_price
                     },
                     bundle: product.bundle,
-                    options: product.options
+                    options: restoredOptions
                   }),
                   variant: originProduct._productInit.variant,
                   original_price: originProduct._productInit.original_price,
@@ -802,9 +846,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                       price: product.price
                     },
                     bundle: product.bundle,
-                    options: product.options
+                    options: restoredOptions
                   }),
-                  price: product.price
+                  price: product.price,
+                  options: restoredOptions
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
@@ -825,7 +870,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
                   price: product.price,
-                  main_product_selling_price
+                  main_product_selling_price,
+                  options: restoredOptions
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
@@ -891,26 +937,46 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const isOrderLevel = (0, import_utils3.isOrderLevelFixedAmountDiscount)(selectedDiscount2);
           const orderLevelAllocation = isOrderLevel ? orderLevelDiscountAllocations.get(selectedDiscount2.id) : null;
           const productAllocation = orderLevelAllocation == null ? void 0 : orderLevelAllocation.get(flatItem._id);
-          let targetProductTotal;
+          const isDeductOptionPrice = !!((_x = selectedDiscount2.config) == null ? void 0 : _x.deductOptionPrice);
+          let mainProductSellingPrice;
           let amount;
           let productDiscountDifference;
+          let discountedOptions = product.options;
+          let optionDiscountAmount = 0;
           if (isOrderLevel && productAllocation) {
             amount = productAllocation.discountAmount;
             productDiscountDifference = productAllocation.difference;
-            targetProductTotal = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
+            mainProductSellingPrice = Math.max(new import_decimal.default(product.price).minus(amount).toNumber(), 0);
           } else {
-            targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
-            amount = new import_decimal.default(product.price).minus(new import_decimal.default(targetProductTotal)).toNumber();
+            mainProductSellingPrice = (0, import_utils.getDiscountAmount)(
+              selectedDiscount2,
+              product.price,
+              product.price
+            );
+            amount = new import_decimal.default(product.price).minus(new import_decimal.default(mainProductSellingPrice)).toNumber();
+          }
+          if (isDeductOptionPrice && ((_y = product.options) == null ? void 0 : _y.length)) {
+            const optionResult = applyDiscountToOptions(
+              product.options,
+              selectedDiscount2
+            );
+            discountedOptions = optionResult.discountedOptions;
+            optionDiscountAmount = optionResult.optionDiscountAmount;
           }
+          const optionsForLineTotal = isDeductOptionPrice && ((_z = product.options) == null ? void 0 : _z.length) ? discountedOptions : product.options;
+          const optionsLineTotal = getOptionTotal(optionsForLineTotal || []);
+          const total = new import_decimal.default(mainProductSellingPrice).plus(optionsLineTotal).toNumber();
+          const mainProductDiscountAmount = amount;
+          const lineDiscountAmount = new import_decimal.default(mainProductDiscountAmount).plus(optionDiscountAmount).toNumber();
           const discountType = selectedDiscount2.tag || selectedDiscount2.type;
           const isGoodPass = discountType === "good_pass";
           const discountDetail = {
-            amount,
+            amount: lineDiscountAmount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
-              fixed_amount: amount,
-              discount_calculation_mode: (_y = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _y.discount_calculation_mode,
+              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
+              fixed_amount: lineDiscountAmount,
+              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.price,
@@ -924,35 +990,32 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             metadata: {
               num: 1,
               // 🔥 order_level 分摊差值
-              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
+              ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference },
+              /** 仅主商品上的优惠金额（不含 option） */
+              mainProductDiscountAmount,
+              optionDiscountAmount
             }
           };
           appliedProducts.push(discountDetail);
           appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
-          let total = targetProductTotal;
-          if (product.options) {
-            total = product.options.reduce((accumulator, currentValue) => {
-              const currentPrice = new import_decimal.default(currentValue.price || 0);
-              const currentNum = new import_decimal.default(currentValue.num || 0);
-              return accumulator.add(currentPrice.mul(currentNum));
-            }, new import_decimal.default(total)).toNumber();
-          }
           if (product.isClient) {
             arr.push(
               this.hooks.setProduct(originProduct, {
                 discount_list: [discountDetail],
-                price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
+                // good_pass：主商品价以折后价为准；勿用 product.price - amount（amount 含 option 优惠时会算错）
+                price: isGoodPass ? mainProductSellingPrice : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
                 origin_total: (0, import_utils2.getProductOriginTotalPrice)({
                   product: {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoreOptionPrices(product.options)
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new import_decimal.default(product.price || 0).toNumber(),
-                total
+                total,
+                options: discountedOptions
               })
             );
           } else {
@@ -964,7 +1027,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 quantity: isNeedSplit ? 1 : product.quantity,
                 total,
                 origin_total: productOriginTotal,
-                main_product_selling_price: targetProductTotal
+                main_product_selling_price: mainProductSellingPrice,
+                options: discountedOptions
               })
             );
           }
@@ -994,7 +1058,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               type: "good_pass",
               discount: {
                 fixed_amount: product.origin_total,
-                discount_calculation_mode: (_z = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _z.discount_calculation_mode,
+                discount_calculation_mode: (_C = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _C.discount_calculation_mode,
                 resource_id: selectedDiscount2.id,
                 title: selectedDiscount2.format_title,
                 original_amount: product.origin_total,
@@ -1068,9 +1132,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: fixedAmountPerItem * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_A = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _A.discount_card_type,
+              discount_card_type: (_D = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _D.discount_card_type,
               fixed_amount: fixedAmountPerItem,
-              discount_calculation_mode: (_B = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _B.discount_calculation_mode,
+              discount_calculation_mode: (_E = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _E.discount_calculation_mode,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
               original_amount: product.original_price,
@@ -1086,7 +1150,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             },
             config: selectedDiscount2 == null ? void 0 : selectedDiscount2.config,
-            _num: (product.num || 1) * (((_C = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _C.num) || 1)
+            _num: (product.num || 1) * (((_F = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _F.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -1109,6 +1173,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const mainProductArr = processedProductsMap2.get(product._id);
         if (!mainProductArr || mainProductArr.length === 0) {
           const getDefaultProduct = () => {
+            const restoredOptions = restoreOptionPrices(product.options);
             if (product.isClient) {
               return this.hooks.setProduct(originProduct, {
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
@@ -1118,7 +1183,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     original_price: product.original_price
                   },
                   bundle: product.bundle,
-                  options: product.options
+                  options: restoredOptions
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: originProduct._productInit.original_price,
@@ -1127,15 +1192,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                     price: product.price
                   },
                   bundle: product.bundle,
-                  options: product.options
-                })
+                  options: restoredOptions
+                }),
+                options: restoredOptions
               });
             } else {
               return this.hooks.setProduct(originProduct, {
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
                 total: product.total,
                 origin_total: product.origin_total,
-                price: product.price
+                price: product.price,
+                options: restoreOptionPrices(product.options)
               });
             }
           };

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.102",
+  "version": "2.2.103",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",