@pisell/pisellos 2.1.106 → 2.1.108

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

@@ -41,7 +41,7 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；该行总券次上限 = maxPassesPerItem × 该行 quantity（按行唯一键区分）。0 表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -50,6 +50,10 @@ export interface Voucher {
  */
 export interface Product {
     product_id: number;
+    /** 订单明细 id，参与行唯一键兜底解析 */
+    id?: number;
+    /** 行级唯一串，参与行唯一键解析 */
+    product_unique_string?: string;
     price: number;
     quantity: number;
     name?: string;
@@ -61,6 +65,9 @@ export interface Product {
     /** 主商品税费 */
     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,7 +136,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；行总上限 = maxPassesPerItem × 该行 quantity（按行唯一键计）。0 表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

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;
@@ -118,27 +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;
-  };
-
-  // 更新指定 Wallet Pass 商品对指定订单商品行的已用卡券次数 +1
-  var incrementItemPassUsage = function incrementItemPassUsage(usageMap, walletPassProductId, orderItemProductId) {
-    if (!usageMap.has(walletPassProductId)) {
-      usageMap.set(walletPassProductId, new Map());
-    }
-    var innerMap = usageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+  // ========== 辅助工具：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;
   };
 
-  // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
+  // 按 maxPassesPerItem 过滤：排除已达到该行「券次」上限的展开行（按 _walletPassLineKey）
   var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, usageMap, walletPassProductId, maxPassesPerItem) {
-    if (maxPassesPerItem <= 0) return products; // 0 = 不限制
+    if (maxPassesPerItem <= 0) return products;
     return products.filter(function (p) {
-      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem;
+      var lineKey = p._walletPassLineKey;
+      if (!lineKey) return true;
+      return getItemPassUsage(usageMap, walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
     });
   };
   // ================================================================
@@ -217,16 +266,16 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         }, new Decimal(0));
       }
     } else {
-      // 非跨商品券：只能抵扣单个商品（剩余金额最高的）
+      // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      // 非跨商品券也受 applicableProductLimit 限制
-      var _deductQty = applicableProductLimit > 0 ? Math.min(_currentAvailableQty, applicableProductLimit) : _currentAvailableQty;
-      // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
-      finalApplicableAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty), maxProduct[amountField]);
+      // maxPassesPerItem 限制每张券最多抵扣的单位数
+      if (maxPassesPerItem > 0) {
+        finalApplicableAmount = Decimal.min(maxProduct[unitPriceField].times(maxPassesPerItem), maxProduct[amountField]);
+      } else {
+        finalApplicableAmount = maxProduct[amountField];
+      }
     }
 
     // 返回最小值
@@ -287,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;
+        var lineKey = p._walletPassLineKey;
+        if (!lineKey) return true;
+        return getItemPassUsage(itemPassUsage, product_id, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
       });
       if (availableAfterPassLimit.length === 0) {
         return {
@@ -323,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();
 
   /**
@@ -426,15 +477,16 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         }, new Decimal(0));
       }
     } else {
-      // 非跨商品券：单个剩余金额最高的商品，也受 applicableProductLimit 限制
+      // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
       var maxProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty2 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      var _deductQty2 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty2, applicableProductLimit) : _currentAvailableQty2;
-      // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
-      calculatedAvailableMaxAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty2), maxProduct[amountField]);
+      // maxPassesPerItem 限制每张券最多抵扣的单位数
+      if (maxPassesPerItem > 0) {
+        calculatedAvailableMaxAmount = Decimal.min(maxProduct[unitPriceField].times(maxPassesPerItem), maxProduct[amountField]);
+      } else {
+        calculatedAvailableMaxAmount = maxProduct[amountField];
+      }
     }
 
     // 取最小值：min(recommended_usage_amount, maxDeductionAmount, 适用商品金额, 订单剩余金额)
@@ -459,8 +511,8 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
           if (deductionLeft.lessThanOrEqualTo(0) || _remainingLimit <= 0) break;
 
           // 动态计算当前可抵扣数量 = ceil(剩余金额 / 单价)
-          var _currentAvailableQty3 = Math.ceil(_product[amountField].dividedBy(_product[unitPriceField]).toNumber());
-          var availableQty = Math.min(_currentAvailableQty3, _remainingLimit);
+          var _currentAvailableQty = Math.ceil(_product[amountField].dividedBy(_product[unitPriceField]).toNumber());
+          var availableQty = Math.min(_currentAvailableQty, _remainingLimit);
 
           // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
           var maxDeductForProduct = Decimal.min(_product[unitPriceField].times(availableQty), _product[amountField]);
@@ -477,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 // 抵扣涉及的数量（用于记录）
@@ -488,17 +542,16 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         _iterator3.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（剩余金额最高的），也受 applicableProductLimit 限制
+      // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
 
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty4 = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      var _availableQty = applicableProductLimit > 0 ? Math.min(_currentAvailableQty4, applicableProductLimit) : _currentAvailableQty4;
-
-      // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
-      var _maxDeductForProduct = Decimal.min(targetProduct[unitPriceField].times(_availableQty), targetProduct[amountField]);
+      // maxPassesPerItem 限制每张券最多抵扣的单位数
+      var _maxDeductForProduct = targetProduct[amountField];
+      if (maxPassesPerItem > 0) {
+        _maxDeductForProduct = Decimal.min(targetProduct[unitPriceField].times(maxPassesPerItem), targetProduct[amountField]);
+      }
       var _actualDeductAmount = Decimal.min(deductionLeft, _maxDeductForProduct);
 
       // 计算实际抵扣的数量
@@ -511,9 +564,10 @@ 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 // 抵扣涉及的数量（用于记录）
+        deductQuantity: _actualDeductQty
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -523,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);
-      });
+      applyMaxPassUsageIncrements(itemPassUsageMap, product_id, maxPassesPerItem, deductionDetails);
 
       // 添加到推荐列表（包含基于当前剩余金额计算的 available_max_amount）
       recommendedVouchers.push(_objectSpread(_objectSpread({}, voucher), {}, {
@@ -610,24 +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;
+    return ((_itemPassUsageMap$get = itemPassUsageMap.get(walletPassProductId)) === null || _itemPassUsageMap$get === void 0 ? void 0 : _itemPassUsageMap$get.get(lineKey)) || 0;
   };
-  var incrementItemPassUsage = function incrementItemPassUsage(walletPassProductId, orderItemProductId) {
-    if (!itemPassUsageMap.has(walletPassProductId)) {
-      itemPassUsageMap.set(walletPassProductId, new Map());
-    }
-    var innerMap = itemPassUsageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
-  };
-  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;
+      var lineKey = p._walletPassLineKey;
+      if (!lineKey) return true;
+      return getItemPassUsageRecalc(walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
     });
   };
 
@@ -652,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), {}, {
@@ -704,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 // 抵扣涉及的数量（用于记录）
@@ -715,17 +761,16 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         _iterator4.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（剩余金额最高的），也受 applicableProductLimit 限制
+      // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
 
-      // 动态计算当前可抵扣数量
-      var _currentAvailableQty5 = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      var _availableQty2 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty5, applicableProductLimit) : _currentAvailableQty5;
-
-      // 计算本商品最大可抵扣金额 = min(数量 * 单价, 剩余金额)
-      var _maxDeductForProduct2 = Decimal.min(targetProduct[unitPriceField].times(_availableQty2), targetProduct[amountField]);
+      // maxPassesPerItem 限制每张券最多抵扣的单位数
+      var _maxDeductForProduct2 = targetProduct[amountField];
+      if (maxPassesPerItem > 0) {
+        _maxDeductForProduct2 = Decimal.min(targetProduct[unitPriceField].times(maxPassesPerItem), targetProduct[amountField]);
+      }
       var _actualDeductAmount2 = Decimal.min(deductionLeft, _maxDeductForProduct2);
 
       // 计算实际抵扣的数量
@@ -738,20 +783,17 @@ 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 // 抵扣涉及的数量（用于记录）
+        deductQuantity: _actualDeductQty2
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
 
     // 更新订单剩余金额
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
-
-    // 更新 maxPassesPerItem 追踪：记录每个被抵扣的商品行
-    deductionDetails.forEach(function (detail) {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id);
-    });
+    applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
       actualDeduction: totalDeducted.toNumber(),
       // 转换为数字
@@ -824,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';
@@ -864,15 +906,16 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
               }, new Decimal(0));
             }
           } else {
-            // 非跨商品券：单个剩余金额最高的商品，也受 applicableProductLimit 限制
+            // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
             var maxProduct = applicableProducts.reduce(function (max, p) {
-              return p[amountField].greaterThan(max[amountField]) ? p : max;
+              return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
             });
-            // 动态计算当前可抵扣数量
-            var _currentAvailableQty6 = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-            var _deductQty3 = applicableProductLimit > 0 ? Math.min(_currentAvailableQty6, applicableProductLimit) : _currentAvailableQty6;
-            // 实际可抵扣金额 = min(数量 * 单价, 剩余金额)
-            calculatedMaxAmount = Decimal.min(maxProduct[unitPriceField].times(_deductQty3), maxProduct[amountField]);
+            // maxPassesPerItem 限制每张券最多抵扣的单位数
+            if (maxPassesPerItem > 0) {
+              calculatedMaxAmount = Decimal.min(maxProduct[unitPriceField].times(maxPassesPerItem), maxProduct[amountField]);
+            } else {
+              calculatedMaxAmount = maxProduct[amountField];
+            }
           }
           calculatedMaxAmount = Decimal.min(baseAmount, calculatedMaxAmount, remainingOrderAmount);
           if (calculatedMaxAmount.lessThanOrEqualTo(0)) {
@@ -897,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;
@@ -943,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;
@@ -978,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);
@@ -989,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),
@@ -1005,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);
@@ -1017,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,
@@ -1034,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/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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -41,7 +41,7 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；该行总券次上限 = maxPassesPerItem × 该行 quantity（按行唯一键区分）。0 表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -50,6 +50,10 @@ export interface Voucher {
  */
 export interface Product {
     product_id: number;
+    /** 订单明细 id，参与行唯一键兜底解析 */
+    id?: number;
+    /** 行级唯一串，参与行唯一键解析 */
+    product_unique_string?: string;
     price: number;
     quantity: number;
     name?: string;
@@ -61,6 +65,9 @@ export interface Product {
     /** 主商品税费 */
     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,7 +136,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单订单行每单位可用同一 Wallet Pass 券次数；行总上限 = maxPassesPerItem × 该行 quantity（按行唯一键计）。0 表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

package/lib/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/lib/model/strategy/adapter/walletPass/utils.js

@@ -38,10 +38,72 @@ __export(utils_exports, {
   getMainProductPrice: () => getMainProductPrice,
   getProductQuantity: () => getProductQuantity,
   processVouchers: () => processVouchers,
-  recalculateVouchers: () => recalculateVouchers
+  recalculateVouchers: () => recalculateVouchers,
+  resolveWalletPassLineKey: () => resolveWalletPassLineKey
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
+var getProductQuantity = (product) => {
+  return product.quantity || product.product_quantity || 1;
+};
+function resolveWalletPassLineKey(product, indexInOrder) {
+  const m = (product == null ? void 0 : product.metadata) || {};
+  const u1 = m.product_unique;
+  if (u1 != null && String(u1).length > 0)
+    return String(u1);
+  const u2 = m.unique_identification_number;
+  if (u2 != null && String(u2).length > 0)
+    return String(u2);
+  if ((product == null ? void 0 : product.id) != null && String(product.id).length > 0)
+    return `order_item:${product.id}`;
+  if ((product == null ? void 0 : product.product_unique_string) != null && String(product.product_unique_string).length > 0) {
+    return String(product.product_unique_string);
+  }
+  return `order_line_${indexInOrder}`;
+}
+function getExpandedOrderLineQuantity(p) {
+  if ((p == null ? void 0 : p._orderLineQuantity) != null && p._orderLineQuantity > 0)
+    return p._orderLineQuantity;
+  return getProductQuantity(p);
+}
+function getMaxPassSlotsForExpandedLine(maxPassesPerItem, p) {
+  if (maxPassesPerItem <= 0)
+    return Infinity;
+  return maxPassesPerItem * getExpandedOrderLineQuantity(p);
+}
+function computePassSlotsIncrement(deductAmount, deductQty, maxPassesPerItem, orderLineQuantity, currentUsage) {
+  if (maxPassesPerItem <= 0 || !deductAmount.greaterThan(0))
+    return 0;
+  const cap = maxPassesPerItem * orderLineQuantity;
+  const room = Math.max(0, cap - currentUsage);
+  if (room <= 0)
+    return 0;
+  const raw = Math.max(1, Math.ceil(Number(deductQty)) || 1);
+  return Math.min(raw, room);
+}
+function applyMaxPassUsageIncrements(usageMap, walletPassProductId, maxPassesPerItem, deductionDetails) {
+  deductionDetails.forEach((detail) => {
+    var _a;
+    const lineKey = detail.lineKey;
+    if (!lineKey || maxPassesPerItem <= 0)
+      return;
+    const orderLineQty = detail.orderLineQuantity != null && detail.orderLineQuantity > 0 ? detail.orderLineQuantity : 1;
+    const cur = ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(lineKey)) || 0;
+    const inc = computePassSlotsIncrement(
+      new import_decimal.default(detail.deductAmount),
+      detail.deductQuantity,
+      maxPassesPerItem,
+      orderLineQty,
+      cur
+    );
+    if (inc <= 0)
+      return;
+    if (!usageMap.has(walletPassProductId))
+      usageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
+    const inner = usageMap.get(walletPassProductId);
+    inner.set(lineKey, cur + inc);
+  });
+}
 var getRecommendedAmount = (voucher) => {
   console.log("voucher312", voucher);
   const { config, recommended_usage_amount, recommended_pure_product_usage_amount } = voucher;
@@ -86,23 +148,19 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
   console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
-  const getItemPassUsage = (usageMap, walletPassProductId, orderItemProductId) => {
+  const getItemPassUsage = (usageMap, walletPassProductId, lineKey) => {
     var _a;
-    return ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(orderItemProductId)) || 0;
-  };
-  const incrementItemPassUsage = (usageMap, walletPassProductId, orderItemProductId) => {
-    if (!usageMap.has(walletPassProductId)) {
-      usageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
-    }
-    const innerMap = usageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+    return ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(lineKey)) || 0;
   };
   const filterByMaxPassesPerItem = (products2, usageMap, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
-    return products2.filter(
-      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem
-    );
+    return products2.filter((p) => {
+      const lineKey = p._walletPassLineKey;
+      if (!lineKey)
+        return true;
+      return getItemPassUsage(usageMap, walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
+    });
   };
   const calculateAvailableMaxAmount = (voucher, productsData, itemPassUsage) => {
     const { config } = voucher;
@@ -146,14 +204,16 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      finalApplicableAmount = import_decimal.default.min(
-        maxProduct[unitPriceField].times(deductQty),
-        maxProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      if (maxPassesPerItem > 0) {
+        finalApplicableAmount = import_decimal.default.min(
+          maxProduct[unitPriceField].times(maxPassesPerItem),
+          maxProduct[amountField]
+        );
+      } else {
+        finalApplicableAmount = maxProduct[amountField];
+      }
     }
     return import_decimal.default.min(baseAmount, finalApplicableAmount, remainingOrderAmount);
   };
@@ -180,7 +240,12 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     if (maxPassesPerItem > 0 && itemPassUsage) {
       const deductTaxAndFee = (config == null ? void 0 : config.deductTaxAndFee) ?? true;
       const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
-      const availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0)).filter((p) => getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem);
+      const availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0)).filter((p) => {
+        const lineKey = p._walletPassLineKey;
+        if (!lineKey)
+          return true;
+        return getItemPassUsage(itemPassUsage, product_id, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
+      });
       if (availableAfterPassLimit.length === 0) {
         return { isAvailable: false, reasonCode: "max_passes_per_item_reached" };
       }
@@ -263,14 +328,16 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-      const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      calculatedAvailableMaxAmount = import_decimal.default.min(
-        maxProduct[unitPriceField].times(deductQty),
-        maxProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      if (maxPassesPerItem > 0) {
+        calculatedAvailableMaxAmount = import_decimal.default.min(
+          maxProduct[unitPriceField].times(maxPassesPerItem),
+          maxProduct[amountField]
+        );
+      } else {
+        calculatedAvailableMaxAmount = maxProduct[amountField];
+      }
     }
     const availableMaxAmount = import_decimal.default.min(
       baseAmount,
@@ -306,6 +373,8 @@ 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
@@ -314,14 +383,15 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      const maxDeductForProduct = import_decimal.default.min(
-        targetProduct[unitPriceField].times(availableQty),
-        targetProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      let maxDeductForProduct = targetProduct[amountField];
+      if (maxPassesPerItem > 0) {
+        maxDeductForProduct = import_decimal.default.min(
+          targetProduct[unitPriceField].times(maxPassesPerItem),
+          targetProduct[amountField]
+        );
+      }
       const actualDeductAmount = import_decimal.default.min(deductionLeft, maxDeductForProduct);
       const actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
       targetProduct[amountField] = targetProduct[amountField].minus(actualDeductAmount);
@@ -330,19 +400,17 @@ 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
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
     if (totalDeducted.greaterThan(0)) {
       remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
       usedVoucherCounts.set(product_id, (usedVoucherCounts.get(product_id) || 0) + 1);
-      deductionDetails.forEach((detail) => {
-        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id);
-      });
+      applyMaxPassUsageIncrements(itemPassUsageMap, product_id, maxPassesPerItem, deductionDetails);
       recommendedVouchers.push({
         ...voucher,
         actualDeduction: totalDeducted.toNumber(),
@@ -385,23 +453,19 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const selectedWithDetails = [];
   const itemPassUsageMap = /* @__PURE__ */ new Map();
-  const getItemPassUsage = (walletPassProductId, orderItemProductId) => {
+  const getItemPassUsageRecalc = (walletPassProductId, lineKey) => {
     var _a;
-    return ((_a = itemPassUsageMap.get(walletPassProductId)) == null ? void 0 : _a.get(orderItemProductId)) || 0;
-  };
-  const incrementItemPassUsage = (walletPassProductId, orderItemProductId) => {
-    if (!itemPassUsageMap.has(walletPassProductId)) {
-      itemPassUsageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
-    }
-    const innerMap = itemPassUsageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+    return ((_a = itemPassUsageMap.get(walletPassProductId)) == null ? void 0 : _a.get(lineKey)) || 0;
   };
-  const filterByMaxPassesPerItem = (products2, walletPassProductId, maxPassesPerItem) => {
+  const filterByMaxPassesPerItemRecalc = (products2, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
-    return products2.filter(
-      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem
-    );
+    return products2.filter((p) => {
+      const lineKey = p._walletPassLineKey;
+      if (!lineKey)
+        return true;
+      return getItemPassUsageRecalc(walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
+    });
   };
   selectedVouchers.forEach((selectedVoucher) => {
     const { config, id } = selectedVoucher;
@@ -412,7 +476,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       selectedVoucher,
       productsForCalc
     ).filter((p) => p[amountField].greaterThan(0));
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, selectedVoucher.product_id, maxPassesPerItem);
+    applicableProducts = filterByMaxPassesPerItemRecalc(applicableProducts, selectedVoucher.product_id, maxPassesPerItem);
     if (applicableProducts.length === 0) {
       selectedWithDetails.push({
         ...selectedVoucher,
@@ -455,6 +519,8 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
           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
@@ -463,14 +529,15 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-      );
-      const currentAvailableQty = Math.ceil(targetProduct[amountField].dividedBy(targetProduct[unitPriceField]).toNumber());
-      const availableQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-      const maxDeductForProduct = import_decimal.default.min(
-        targetProduct[unitPriceField].times(availableQty),
-        targetProduct[amountField]
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
+      let maxDeductForProduct = targetProduct[amountField];
+      if (maxPassesPerItem > 0) {
+        maxDeductForProduct = import_decimal.default.min(
+          targetProduct[unitPriceField].times(maxPassesPerItem),
+          targetProduct[amountField]
+        );
+      }
       const actualDeductAmount = import_decimal.default.min(deductionLeft, maxDeductForProduct);
       const actualDeductQty = Math.ceil(actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
       targetProduct[amountField] = targetProduct[amountField].minus(actualDeductAmount);
@@ -479,17 +546,15 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
         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
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
-    deductionDetails.forEach((detail) => {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id);
-    });
+    applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push({
       ...selectedVoucher,
       actualDeduction: totalDeducted.toNumber(),
@@ -539,7 +604,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
           voucher,
           productsForCalc
         ).filter((p) => p[amountField].greaterThan(0));
-        applicableProducts = filterByMaxPassesPerItem(applicableProducts, product_id, maxPassesPerItem);
+        applicableProducts = filterByMaxPassesPerItemRecalc(applicableProducts, product_id, maxPassesPerItem);
         if (applicableProducts.length === 0) {
           isAvailable = false;
           reasonCode = "not_meet_the_required_conditions";
@@ -572,14 +637,16 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
             }
           } else {
             const maxProduct = applicableProducts.reduce(
-              (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
-            );
-            const currentAvailableQty = Math.ceil(maxProduct[amountField].dividedBy(maxProduct[unitPriceField]).toNumber());
-            const deductQty = applicableProductLimit > 0 ? Math.min(currentAvailableQty, applicableProductLimit) : currentAvailableQty;
-            calculatedMaxAmount = import_decimal.default.min(
-              maxProduct[unitPriceField].times(deductQty),
-              maxProduct[amountField]
+              (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
             );
+            if (maxPassesPerItem > 0) {
+              calculatedMaxAmount = import_decimal.default.min(
+                maxProduct[unitPriceField].times(maxPassesPerItem),
+                maxProduct[amountField]
+              );
+            } else {
+              calculatedMaxAmount = maxProduct[amountField];
+            }
           }
           calculatedMaxAmount = import_decimal.default.min(
             baseAmount,
@@ -642,14 +709,17 @@ var getBundleItemPrice = (bundleItem, parentQuantity, isDeductTaxAndFee) => {
 };
 var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
   const expandedProducts = [];
-  products.forEach((product) => {
+  products.forEach((product, indexInOrder) => {
     const productQuantity = getProductQuantity(product);
+    const parentLineKey = resolveWalletPassLineKey(product, indexInOrder);
     const unitPriceWithTax = getMainProductPrice(product, true);
     const unitPricePure = getMainProductPrice(product, false);
     expandedProducts.push({
       ...product,
       is_bundle_item: false,
       parent_product_id: null,
+      _walletPassLineKey: parentLineKey,
+      _orderLineQuantity: productQuantity,
       // 单价（用于按 quantity 计算抵扣）
       unitPriceWithTax: new import_decimal.default(unitPriceWithTax),
       unitPricePure: new import_decimal.default(unitPricePure),
@@ -664,6 +734,7 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
       product.product_bundle.forEach((bundleItem) => {
         if (getBundleItemIsOriginalPrice(bundleItem)) {
           const bundleQuantity = bundleItem.num * productQuantity;
+          const bundleLineKey = `${parentLineKey}#bundle:${bundleItem.bundle_id}:${bundleItem.bundle_product_id}`;
           const bundleUnitPriceWithTax = new import_decimal.default(getBundleItemPrice(bundleItem, 1, true)).dividedBy(bundleItem.num);
           const bundleUnitPricePure = new import_decimal.default(getBundleItemPrice(bundleItem, 1, false)).dividedBy(bundleItem.num);
           expandedProducts.push({
@@ -674,6 +745,8 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
             parent_product_id: product.product_id,
             quantity: bundleQuantity,
             // 子商品数量 * 主商品数量
+            _walletPassLineKey: bundleLineKey,
+            _orderLineQuantity: bundleQuantity,
             // 单价（用于按 quantity 计算抵扣）
             unitPriceWithTax: bundleUnitPriceWithTax,
             unitPricePure: bundleUnitPricePure,
@@ -690,9 +763,6 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
   });
   return expandedProducts;
 };
-var getProductQuantity = (product) => {
-  return product.quantity || product.product_quantity || 1;
-};
 var getBundleItemIsOriginalPrice = (item) => {
   return (item == null ? void 0 : item.price_type) === "markup" && (item == null ? void 0 : item.price_type_ext) === "product_price";
 };
@@ -716,5 +786,6 @@ var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   getMainProductPrice,
   getProductQuantity,
   processVouchers,
-  recalculateVouchers
+  recalculateVouchers,
+  resolveWalletPassLineKey
 });

package/lib/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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/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<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/package.json

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