@pisell/pisellos 2.2.101 → 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

@@ -41,8 +41,10 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；该行总券次上限 = maxPassesPerItem × 该行 quantity（按行唯一键区分）。0 表示不限制。 */
         maxPassesPerItem: number;
+        /** 是否抵扣单规格价格 (Option Price)，默认 false。开启后折扣范围包含 option 的 add_price */
+        deductOptionPrice: boolean;
     };
 }
 /**
@@ -50,6 +52,10 @@ export interface Voucher {
  */
 export interface Product {
     product_id: number;
+    /** 订单明细 id，参与行唯一键兜底解析 */
+    id?: number;
+    /** 行级唯一串，参与行唯一键解析 */
+    product_unique_string?: string;
     price: number;
     quantity: number;
     name?: string;
@@ -58,9 +64,19 @@ 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: {
+        /** 行唯一标识，优先用于 Wallet Pass 按行配额 */
+        product_unique?: string;
+        unique_identification_number?: string;
         main_product_attached_bundle_tax_fee?: number;
         main_product_attached_bundle_surcharge_fee?: number;
         surcharge_rounding_remainder?: number;
@@ -129,8 +145,10 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；行总上限 = maxPassesPerItem × 该行 quantity（按行唯一键计）。0 表示不限制。 */
         maxPassesPerItem: number;
+        /** 是否抵扣单规格价格 (Option Price)，默认 false */
+        deductOptionPrice: boolean;
     }>[];
 }
 /**

package/dist/model/strategy/adapter/walletPass/utils.d.ts

@@ -1,4 +1,10 @@
 import { Product, Voucher } from './type';
+/** 订单商品数量 */
+export declare const getProductQuantity: (product: any) => any;
+/**
+ * 订单商品行唯一键，用于 maxPassesPerItem 按行、按件配额（同 SPU 不同规格视为不同行）。
+ */
+export declare function resolveWalletPassLineKey(product: any, indexInOrder: number): string;
 export declare const getApplicableProductIds: (voucher: Voucher) => number[] | null;
 /**
  * 优惠券处理函数
@@ -24,26 +30,20 @@ export declare function recalculateVouchers(allVouchers: any[], selectedVouchers
     selectedWithDetails: any[];
 };
 /**
- * 获取主商品价格
+ * 获取主商品价格（单价，不含舍入余数）
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 商品单价
  */
 export declare const getMainProductPrice: (product: Product, isDeductTaxAndFee: boolean) => number;
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export declare const getBundleItemPrice: (bundleItem: any, parentQuantity: number, isDeductTaxAndFee: boolean) => number;
-/**
- * 获取商品数量
- * @param product 商品
- * @returns 商品数量
- */
-export declare const getProductQuantity: (product: any) => any;
 export declare const getBundleItemIsOriginalPrice: (item: any) => boolean;
 export declare const getBundleItemIsMarkupPrice: (item: any) => boolean;
 export declare const getBundleItemIsDiscountPrice: (item: any) => boolean;

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

@@ -12,6 +12,63 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import Decimal from 'decimal.js';
+/** 订单商品数量 */
+export var getProductQuantity = function getProductQuantity(product) {
+  return product.quantity || product.product_quantity || 1;
+};
+
+/**
+ * 订单商品行唯一键，用于 maxPassesPerItem 按行、按件配额（同 SPU 不同规格视为不同行）。
+ */
+export function resolveWalletPassLineKey(product, indexInOrder) {
+  var m = (product === null || product === void 0 ? void 0 : product.metadata) || {};
+  var u1 = m.product_unique;
+  if (u1 != null && String(u1).length > 0) return String(u1);
+  var u2 = m.unique_identification_number;
+  if (u2 != null && String(u2).length > 0) return String(u2);
+  if ((product === null || product === void 0 ? void 0 : product.id) != null && String(product.id).length > 0) return "order_item:".concat(product.id);
+  if ((product === null || product === void 0 ? void 0 : product.product_unique_string) != null && String(product.product_unique_string).length > 0) {
+    return String(product.product_unique_string);
+  }
+  return "order_line_".concat(indexInOrder);
+}
+function getExpandedOrderLineQuantity(p) {
+  if ((p === null || p === void 0 ? void 0 : p._orderLineQuantity) != null && p._orderLineQuantity > 0) return p._orderLineQuantity;
+  return getProductQuantity(p);
+}
+
+/** 该行允许消耗的「券次」上限：maxPassesPerItem × 订单行件数 */
+function getMaxPassSlotsForExpandedLine(maxPassesPerItem, p) {
+  if (maxPassesPerItem <= 0) return Infinity;
+  return maxPassesPerItem * getExpandedOrderLineQuantity(p);
+}
+
+/**
+ * 本次抵扣占用多少「券次」配额：有抵扣时至少占 1，并与按金额折算的件数挂钩，不超过剩余额度。
+ */
+function computePassSlotsIncrement(deductAmount, deductQty, maxPassesPerItem, orderLineQuantity, currentUsage) {
+  if (maxPassesPerItem <= 0 || !deductAmount.greaterThan(0)) return 0;
+  var cap = maxPassesPerItem * orderLineQuantity;
+  var room = Math.max(0, cap - currentUsage);
+  if (room <= 0) return 0;
+  var raw = Math.max(1, Math.ceil(Number(deductQty)) || 1);
+  return Math.min(raw, room);
+}
+function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPerItem, deductionDetails) {
+  deductionDetails.forEach(function (detail) {
+    var _usageMap$get;
+    var lineKey = detail.lineKey;
+    if (!lineKey || maxPassesPerItem <= 0) return;
+    var orderLineQty = detail.orderLineQuantity != null && detail.orderLineQuantity > 0 ? detail.orderLineQuantity : 1;
+    var cur = ((_usageMap$get = usageMap.get(walletPassProductId)) === null || _usageMap$get === void 0 ? void 0 : _usageMap$get.get(lineKey)) || 0;
+    var inc = computePassSlotsIncrement(new Decimal(detail.deductAmount), detail.deductQuantity, maxPassesPerItem, orderLineQty, cur);
+    if (inc <= 0) return;
+    if (!usageMap.has(walletPassProductId)) usageMap.set(walletPassProductId, new Map());
+    var inner = usageMap.get(walletPassProductId);
+    inner.set(lineKey, cur + inc);
+  });
+}
+
 // 辅助函数：根据 deductTaxAndFee 配置获取推荐使用金额
 var getRecommendedAmount = function getRecommendedAmount(voucher) {
   var _config$deductTaxAndF;
@@ -101,18 +158,6 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
   });
 };
 
-/**
- * 计算指定 product_id 在展开后的商品列表中的总 quantity
- * 处理同一 product_id 可能分散在多条记录中的情况（如3个独立的 quantity=1 条目）
- */
-var getTotalQuantityByProductId = function getTotalQuantityByProductId(allProducts, productId) {
-  return allProducts.filter(function (p) {
-    return p.product_id === productId;
-  }).reduce(function (sum, p) {
-    return sum + getProductQuantity(p);
-  }, 0);
-};
-
 /**
  * 优惠券处理函数
  * @param applicableVouchers 可用的券列表
@@ -130,29 +175,19 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   var productsCopy = expandProductsWithBundleItems(products, true);
   var remainingOrderAmount = new Decimal(orderTotalAmount); // 订单剩余应付金额
 
-  // ========== 辅助工具：maxPassesPerItem（单商品可用卡券上限）追踪 ==========
-  // 获取指定 Wallet Pass 商品对指定订单商品行的已用卡券次数
-  var getItemPassUsage = function getItemPassUsage(usageMap, walletPassProductId, orderItemProductId) {
-    var _usageMap$get;
-    return ((_usageMap$get = usageMap.get(walletPassProductId)) === null || _usageMap$get === void 0 ? void 0 : _usageMap$get.get(orderItemProductId)) || 0;
+  // ========== 辅助工具：maxPassesPerItem（按订单行 + 件数）追踪 ==========
+  var getItemPassUsage = function getItemPassUsage(usageMap, walletPassProductId, lineKey) {
+    var _usageMap$get2;
+    return ((_usageMap$get2 = usageMap.get(walletPassProductId)) === null || _usageMap$get2 === void 0 ? void 0 : _usageMap$get2.get(lineKey)) || 0;
   };
 
-  // 更新指定 Wallet Pass 商品对指定订单商品行的已用卡券次数
-  var incrementItemPassUsage = function incrementItemPassUsage(usageMap, walletPassProductId, orderItemProductId) {
-    var count = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
-    if (!usageMap.has(walletPassProductId)) {
-      usageMap.set(walletPassProductId, new Map());
-    }
-    var innerMap = usageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
-  };
-
-  // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
-  // maxPassesPerItem 是 per-unit 的限制，总上限 = maxPassesPerItem × 该 product_id 的总 quantity
-  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, allProducts, usageMap, walletPassProductId, maxPassesPerItem) {
-    if (maxPassesPerItem <= 0) return products; // 0 = 不限制
+  // 按 maxPassesPerItem 过滤：排除已达到该行「券次」上限的展开行（按 _walletPassLineKey）
+  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, usageMap, walletPassProductId, maxPassesPerItem) {
+    if (maxPassesPerItem <= 0) return products;
     return products.filter(function (p) {
-      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id);
+      var lineKey = p._walletPassLineKey;
+      if (!lineKey) return true;
+      return getItemPassUsage(usageMap, walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
     });
   };
   // ================================================================
@@ -189,7 +224,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
 
     // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
     if (itemPassUsage) {
-      applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsData, itemPassUsage, voucher.product_id, maxPassesPerItem);
+      applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsage, voucher.product_id, maxPassesPerItem);
     }
     if (applicableProducts.length === 0) {
       return new Decimal(0);
@@ -301,7 +336,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       var availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter(function (p) {
         return p[amountField].greaterThan(0);
       }).filter(function (p) {
-        return getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsData, p.product_id);
+        var lineKey = p._walletPassLineKey;
+        if (!lineKey) return true;
+        return getItemPassUsage(itemPassUsage, product_id, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
       });
       if (availableAfterPassLimit.length === 0) {
         return {
@@ -337,7 +374,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   // 重置商品余额追踪（同时维护含税和不含税两个金额池）
   var productsForRecommendation = expandProductsWithBundleItems(products, true);
   remainingOrderAmount = new Decimal(orderTotalAmount);
-  // 追踪推荐阶段每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数
+  // 追踪推荐阶段每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数（按行唯一键）
   var itemPassUsageMap = new Map();
 
   /**
@@ -398,7 +435,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     });
 
     // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsForRecommendation, itemPassUsageMap, product_id, maxPassesPerItem);
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsageMap, product_id, maxPassesPerItem);
     if (applicableProducts.length === 0) return false;
 
     // ========== 关键修改：在应用券之前，基于当前剩余金额计算 _available_max_amount ==========
@@ -492,6 +529,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
             product_id: _product.product_id,
             parent_product_id: _product.parent_product_id || null,
             is_bundle_item: _product.is_bundle_item || false,
+            lineKey: _product._walletPassLineKey,
+            orderLineQuantity: getExpandedOrderLineQuantity(_product),
             deductAmount: actualDeductAmount.toNumber(),
             // 转换为数字
             deductQuantity: actualDeductQty // 抵扣涉及的数量（用于记录）
@@ -525,6 +564,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         product_id: targetProduct.product_id,
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
+        lineKey: targetProduct._walletPassLineKey,
+        orderLineQuantity: getExpandedOrderLineQuantity(targetProduct),
         deductAmount: _actualDeductAmount.toNumber(),
         deductQuantity: _actualDeductQty
       });
@@ -536,11 +577,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
 
       // 更新券使用次数（按 product_id 统计）
       usedVoucherCounts.set(product_id, (usedVoucherCounts.get(product_id) || 0) + 1);
-
-      // 更新 maxPassesPerItem 追踪：按实际抵扣数量递增
-      deductionDetails.forEach(function (detail) {
-        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id, detail.deductQuantity);
-      });
+      applyMaxPassUsageIncrements(itemPassUsageMap, product_id, maxPassesPerItem, deductionDetails);
 
       // 添加到推荐列表（包含基于当前剩余金额计算的 available_max_amount）
       recommendedVouchers.push(_objectSpread(_objectSpread({}, voucher), {}, {
@@ -623,25 +660,18 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   var remainingOrderAmount = new Decimal(orderTotalAmount);
   var selectedWithDetails = [];
 
-  // 追踪每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数
-  // Map<walletPassProductId, Map<orderItemProductId, usedCount>>
+  // 追踪每个 Wallet Pass 商品对每个订单商品行的已使用卡券次数（按行唯一键）
   var itemPassUsageMap = new Map();
-  var getItemPassUsage = function getItemPassUsage(walletPassProductId, orderItemProductId) {
+  var getItemPassUsageRecalc = function getItemPassUsageRecalc(walletPassProductId, lineKey) {
     var _itemPassUsageMap$get;
-    return ((_itemPassUsageMap$get = itemPassUsageMap.get(walletPassProductId)) === null || _itemPassUsageMap$get === void 0 ? void 0 : _itemPassUsageMap$get.get(orderItemProductId)) || 0;
-  };
-  var incrementItemPassUsage = function incrementItemPassUsage(walletPassProductId, orderItemProductId) {
-    var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-    if (!itemPassUsageMap.has(walletPassProductId)) {
-      itemPassUsageMap.set(walletPassProductId, new Map());
-    }
-    var innerMap = itemPassUsageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
+    return ((_itemPassUsageMap$get = itemPassUsageMap.get(walletPassProductId)) === null || _itemPassUsageMap$get === void 0 ? void 0 : _itemPassUsageMap$get.get(lineKey)) || 0;
   };
-  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, walletPassProductId, maxPassesPerItem) {
-    if (maxPassesPerItem <= 0) return products; // 0 = 不限制
+  var filterByMaxPassesPerItemRecalc = function filterByMaxPassesPerItemRecalc(products, walletPassProductId, maxPassesPerItem) {
+    if (maxPassesPerItem <= 0) return products;
     return products.filter(function (p) {
-      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsForCalc, p.product_id);
+      var lineKey = p._walletPassLineKey;
+      if (!lineKey) return true;
+      return getItemPassUsageRecalc(walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
     });
   };
 
@@ -666,8 +696,8 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       return p[amountField].greaterThan(0);
     });
 
-    // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, selectedVoucher.product_id, maxPassesPerItem);
+    // 按 maxPassesPerItem 过滤：排除已达到该行券次上限的展开行
+    applicableProducts = filterByMaxPassesPerItemRecalc(applicableProducts, selectedVoucher.product_id, maxPassesPerItem);
     if (applicableProducts.length === 0) {
       // 无适用商品，跳过
       selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
@@ -718,6 +748,8 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
             product_id: product.product_id,
             parent_product_id: product.parent_product_id || null,
             is_bundle_item: product.is_bundle_item || false,
+            lineKey: product._walletPassLineKey,
+            orderLineQuantity: getExpandedOrderLineQuantity(product),
             deductAmount: actualDeductAmount.toNumber(),
             // 转换为数字
             deductQuantity: actualDeductQty // 抵扣涉及的数量（用于记录）
@@ -751,6 +783,8 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         product_id: targetProduct.product_id,
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
+        lineKey: targetProduct._walletPassLineKey,
+        orderLineQuantity: getExpandedOrderLineQuantity(targetProduct),
         deductAmount: _actualDeductAmount2.toNumber(),
         deductQuantity: _actualDeductQty2
       });
@@ -759,11 +793,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
     // 更新订单剩余金额
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
-
-    // 更新 maxPassesPerItem 追踪：按实际抵扣数量递增
-    deductionDetails.forEach(function (detail) {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id, detail.deductQuantity);
-    });
+    applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
       actualDeduction: totalDeducted.toNumber(),
       // 转换为数字
@@ -836,7 +866,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         });
 
         // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
-        applicableProducts = filterByMaxPassesPerItem(applicableProducts, product_id, maxPassesPerItem);
+        applicableProducts = filterByMaxPassesPerItemRecalc(applicableProducts, product_id, maxPassesPerItem);
         if (applicableProducts.length === 0) {
           isAvailable = false;
           reasonCode = 'not_meet_the_required_conditions';
@@ -910,10 +940,10 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 }
 
 /**
- * 获取主商品价格
+ * 获取主商品价格（单价，不含舍入余数）
  * @param product 商品
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 商品价格
+ * @returns 商品单价
  */
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
   var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
@@ -956,11 +986,11 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
 };
 
 /**
- * 获取套餐子商品价格
+ * 获取套餐子商品价格（不含舍入余数）
  * @param bundleItem 套餐子商品
  * @param parentQuantity 父商品数量
  * @param isDeductTaxAndFee 是否抵扣税费与附加费
- * @returns 子商品总价格
+ * @returns 子商品总价格（不含舍入余数）
  */
 export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQuantity, isDeductTaxAndFee) {
   var _bundleItem$bundle_se2;
@@ -991,8 +1021,9 @@ export var getBundleItemPrice = function getBundleItemPrice(bundleItem, parentQu
  */
 var expandProductsWithBundleItems = function expandProductsWithBundleItems(products, deductTaxAndFee) {
   var expandedProducts = [];
-  products.forEach(function (product) {
+  products.forEach(function (product, indexInOrder) {
     var productQuantity = getProductQuantity(product);
+    var parentLineKey = resolveWalletPassLineKey(product, indexInOrder);
 
     // 计算主商品单价（含税和不含税）
     var unitPriceWithTax = getMainProductPrice(product, true);
@@ -1002,6 +1033,8 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
     expandedProducts.push(_objectSpread(_objectSpread({}, product), {}, {
       is_bundle_item: false,
       parent_product_id: null,
+      _walletPassLineKey: parentLineKey,
+      _orderLineQuantity: productQuantity,
       // 单价（用于按 quantity 计算抵扣）
       unitPriceWithTax: new Decimal(unitPriceWithTax),
       unitPricePure: new Decimal(unitPricePure),
@@ -1018,6 +1051,7 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
       product.product_bundle.forEach(function (bundleItem) {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
           var bundleQuantity = bundleItem.num * productQuantity;
+          var bundleLineKey = "".concat(parentLineKey, "#bundle:").concat(bundleItem.bundle_id, ":").concat(bundleItem.bundle_product_id);
           // 计算子商品单价（注意：getBundleItemPrice 返回的是总价，需要除以数量得到单价）
           var bundleUnitPriceWithTax = new Decimal(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
           var bundleUnitPricePure = new Decimal(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
@@ -1030,6 +1064,8 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
             parent_product_id: product.product_id,
             quantity: bundleQuantity,
             // 子商品数量 * 主商品数量
+            _walletPassLineKey: bundleLineKey,
+            _orderLineQuantity: bundleQuantity,
             // 单价（用于按 quantity 计算抵扣）
             unitPriceWithTax: bundleUnitPriceWithTax,
             unitPricePure: bundleUnitPricePure,
@@ -1047,15 +1083,6 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
   return expandedProducts;
 };
 
-/**
- * 获取商品数量
- * @param product 商品
- * @returns 商品数量
- */
-export var getProductQuantity = function getProductQuantity(product) {
-  return product.quantity || product.product_quantity || 1;
-};
-
 // bundle商品是否是原价
 export var getBundleItemIsOriginalPrice = function getBundleItemIsOriginalPrice(item) {
   return (item === null || item === void 0 ? void 0 : item.price_type) === 'markup' && (item === null || item === void 0 ? void 0 : item.price_type_ext) === 'product_price';

package/dist/modules/Cart/utils/cartProduct.js

@@ -14,6 +14,20 @@ import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 
+/** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
+var toDiscountPayload = function toDiscountPayload(discountItem) {
+  var _discountItem$discoun, _discountItem$discoun2;
+  return {
+    amount: discountItem.amount,
+    tag: discountItem.type,
+    par_value: (_discountItem$discoun = discountItem.discount) === null || _discountItem$discoun === void 0 ? void 0 : _discountItem$discoun.percent,
+    config: discountItem.config,
+    metadata: {
+      discount_card_type: discountItem === null || discountItem === void 0 || (_discountItem$discoun2 = discountItem.discount) === null || _discountItem$discoun2 === void 0 ? void 0 : _discountItem$discoun2.discount_card_type
+    }
+  };
+};
+
 /**
  * @title 处理组合商品
  * @description 组合商品需要直接修改 product 里的价格和 is_charge_tax
@@ -189,6 +203,7 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
  * @returns 商品总价
  */
 export var getProductTotalPrice = function getProductTotalPrice(params) {
+  var _options$map;
   var product = params.product,
     bundle = params.bundle,
     options = params.options,
@@ -196,23 +211,29 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   // const num = params.num || 1;
   var price = Number(product.price);
 
+  // option 行：unit 折后价在循环中与主商品使用同一套 getDiscountAmount（含 deductOptionPrice）
+  var optionRows = (_options$map = options === null || options === void 0 ? void 0 : options.map(function (currentValue) {
+    var _ref, _currentValue$price, _ref2, _currentValue$num;
+    return {
+      unit: Number((_ref = (_currentValue$price = currentValue.price) !== null && _currentValue$price !== void 0 ? _currentValue$price : currentValue.add_price) !== null && _ref !== void 0 ? _ref : 0),
+      num: Number((_ref2 = (_currentValue$num = currentValue.num) !== null && _currentValue$num !== void 0 ? _currentValue$num : currentValue.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1)
+    };
+  })) !== null && _options$map !== void 0 ? _options$map : [];
+
   // 如果商品有折扣，则计算折扣
   if (discounts !== null && discounts !== void 0 && discounts.length) {
     discounts.forEach(function (currentValue) {
-      var _currentValue$discoun;
-      // 不是商品券则代表折扣卡，计算打折后的价格
-      // 一个商品折扣卡只能存在于一张
-      // if (currentValue.type !== 'good_pass') {
-      price = getDiscountAmount({
-        amount: currentValue.amount,
-        tag: currentValue.type,
-        par_value: currentValue.discount.percent,
-        config: currentValue.config,
-        metadata: {
-          discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+      var _currentValue$config;
+      var payload = toDiscountPayload(currentValue);
+      price = getDiscountAmount(payload, price, price);
+      if (currentValue !== null && currentValue !== void 0 && (_currentValue$config = currentValue.config) !== null && _currentValue$config !== void 0 && _currentValue$config.deductOptionPrice && optionRows.length) {
+        for (var i = 0; i < optionRows.length; i++) {
+          var row = optionRows[i];
+          optionRows[i] = _objectSpread(_objectSpread({}, row), {}, {
+            unit: getDiscountAmount(payload, row.unit, row.unit)
+          });
         }
-      }, price, price);
-      // }
+      }
     });
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -221,10 +242,10 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
     }, price);
   }
 
-  // 单规格
-  if (options !== null && options !== void 0 && options.length) {
-    price = options.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+  // 单规格 / 加购 option
+  if (optionRows.length) {
+    price = optionRows.reduce(function (accumulator, row) {
+      return accumulator + row.unit * row.num;
     }, price);
   }
   return Math.max(0, price);
@@ -369,11 +390,11 @@ export var getProductDeposit = function getProductDeposit(params) {
   // 判定商品是否有定金规则
   if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
     var total = new Decimal(0);
-    var _ref = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
-      deposit_fixed = _ref.deposit_fixed,
-      deposit_percentage = _ref.deposit_percentage,
-      deposit_policy_data = _ref.deposit_policy_data,
-      self_deposit_policy_ids = _ref.self_deposit_policy_ids;
+    var _ref3 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref3.deposit_fixed,
+      deposit_percentage = _ref3.deposit_percentage,
+      deposit_policy_data = _ref3.deposit_policy_data,
+      self_deposit_policy_ids = _ref3.self_deposit_policy_ids;
     // 所有协议数据
     var allProtocols = deposit_policy_data || [];
     // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
@@ -467,9 +488,9 @@ export var handleProductDeposit = function handleProductDeposit(params) {
       depositTotal: new Decimal(0)
     };
   }
-  var _ref2 = depositData || {},
-    deposit_fixed = _ref2.deposit_fixed,
-    deposit_percentage = _ref2.deposit_percentage;
+  var _ref4 = depositData || {},
+    deposit_fixed = _ref4.deposit_fixed,
+    deposit_percentage = _ref4.deposit_percentage;
   if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
     var depositFixed = Decimal(deposit_fixed || 0);
     var depositPercent = Decimal(deposit_percentage || 0);

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/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }