@pisell/pisellos 2.1.106 → 2.1.107

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 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -129,7 +129,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

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

@@ -101,6 +101,18 @@ 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 可用的券列表
@@ -125,20 +137,22 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     return ((_usageMap$get = usageMap.get(walletPassProductId)) === null || _usageMap$get === void 0 ? void 0 : _usageMap$get.get(orderItemProductId)) || 0;
   };
 
-  // 更新指定 Wallet Pass 商品对指定订单商品行的已用卡券次数 +1
+  // 更新指定 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) + 1);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
   };
 
   // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
-  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, usageMap, walletPassProductId, maxPassesPerItem) {
+  // maxPassesPerItem 是 per-unit 的限制，总上限 = maxPassesPerItem × 该 product_id 的总 quantity
+  var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, allProducts, usageMap, walletPassProductId, maxPassesPerItem) {
     if (maxPassesPerItem <= 0) return products; // 0 = 不限制
     return products.filter(function (p) {
-      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem;
+      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id);
     });
   };
   // ================================================================
@@ -175,7 +189,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
 
     // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
     if (itemPassUsage) {
-      applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsage, voucher.product_id, maxPassesPerItem);
+      applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsData, itemPassUsage, voucher.product_id, maxPassesPerItem);
     }
     if (applicableProducts.length === 0) {
       return new Decimal(0);
@@ -217,16 +231,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 +301,7 @@ 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;
+        return getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsData, p.product_id);
       });
       if (availableAfterPassLimit.length === 0) {
         return {
@@ -384,7 +398,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
     });
 
     // 按 maxPassesPerItem 过滤：排除已达到单商品可用卡券上限的商品
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsageMap, product_id, maxPassesPerItem);
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsForRecommendation, itemPassUsageMap, product_id, maxPassesPerItem);
     if (applicableProducts.length === 0) return false;
 
     // ========== 关键修改：在应用券之前，基于当前剩余金额计算 _available_max_amount ==========
@@ -426,15 +440,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 +474,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]);
@@ -488,17 +503,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);
 
       // 计算实际抵扣的数量
@@ -512,8 +526,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: _actualDeductAmount.toNumber(),
-        // 转换为数字
-        deductQuantity: _actualDeductQty // 抵扣涉及的数量（用于记录）
+        deductQuantity: _actualDeductQty
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -524,9 +537,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       // 更新券使用次数（按 product_id 统计）
       usedVoucherCounts.set(product_id, (usedVoucherCounts.get(product_id) || 0) + 1);
 
-      // 更新 maxPassesPerItem 追踪：记录每个被抵扣的商品行
+      // 更新 maxPassesPerItem 追踪：按实际抵扣数量递增
       deductionDetails.forEach(function (detail) {
-        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id);
+        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id, detail.deductQuantity);
       });
 
       // 添加到推荐列表（包含基于当前剩余金额计算的 available_max_amount）
@@ -618,16 +631,17 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     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) + 1);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
   };
   var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, walletPassProductId, maxPassesPerItem) {
     if (maxPassesPerItem <= 0) return products; // 0 = 不限制
     return products.filter(function (p) {
-      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem;
+      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsForCalc, p.product_id);
     });
   };
 
@@ -715,17 +729,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);
 
       // 计算实际抵扣的数量
@@ -739,8 +752,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: _actualDeductAmount2.toNumber(),
-        // 转换为数字
-        deductQuantity: _actualDeductQty2 // 抵扣涉及的数量（用于记录）
+        deductQuantity: _actualDeductQty2
       });
     }
     var totalDeducted = maxDeduction.minus(deductionLeft);
@@ -748,9 +760,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
     // 更新订单剩余金额
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
 
-    // 更新 maxPassesPerItem 追踪：记录每个被抵扣的商品行
+    // 更新 maxPassesPerItem 追踪：按实际抵扣数量递增
     deductionDetails.forEach(function (detail) {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id);
+      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id, detail.deductQuantity);
     });
     selectedWithDetails.push(_objectSpread(_objectSpread({}, selectedVoucher), {}, {
       actualDeduction: totalDeducted.toNumber(),
@@ -864,15 +876,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)) {

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -129,7 +129,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

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

@@ -82,6 +82,9 @@ var getApplicableProducts = (voucher, productsData) => {
   }
   return productsData.filter((p) => applicableProductIds.includes(p.product_id));
 };
+var getTotalQuantityByProductId = (allProducts, productId) => {
+  return allProducts.filter((p) => p.product_id === productId).reduce((sum, p) => sum + getProductQuantity(p), 0);
+};
 function processVouchers(applicableVouchers, orderTotalAmount, products) {
   console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
@@ -90,18 +93,18 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     var _a;
     return ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(orderItemProductId)) || 0;
   };
-  const incrementItemPassUsage = (usageMap, walletPassProductId, orderItemProductId) => {
+  const incrementItemPassUsage = (usageMap, walletPassProductId, orderItemProductId, count = 1) => {
     if (!usageMap.has(walletPassProductId)) {
       usageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
     }
     const innerMap = usageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
   };
-  const filterByMaxPassesPerItem = (products2, usageMap, walletPassProductId, maxPassesPerItem) => {
+  const filterByMaxPassesPerItem = (products2, allProducts, usageMap, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem
+      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id)
     );
   };
   const calculateAvailableMaxAmount = (voucher, productsData, itemPassUsage) => {
@@ -116,7 +119,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
     let applicableProducts = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0));
     if (itemPassUsage) {
-      applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsage, voucher.product_id, maxPassesPerItem);
+      applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsData, itemPassUsage, voucher.product_id, maxPassesPerItem);
     }
     if (applicableProducts.length === 0) {
       return new import_decimal.default(0);
@@ -146,14 +149,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 +185,7 @@ 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) => getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsData, p.product_id));
       if (availableAfterPassLimit.length === 0) {
         return { isAvailable: false, reasonCode: "max_passes_per_item_reached" };
       }
@@ -230,7 +235,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       voucher,
       productsForRecommendation
     ).filter((p) => p[amountField].greaterThan(0));
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsageMap, product_id, maxPassesPerItem);
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsForRecommendation, itemPassUsageMap, product_id, maxPassesPerItem);
     if (applicableProducts.length === 0)
       return false;
     const usageAmount = typeof voucher.edit_current_amount === "number" ? voucher.edit_current_amount : getRecommendedAmount(voucher);
@@ -263,14 +268,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,
@@ -314,14 +321,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);
@@ -331,9 +339,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: actualDeductAmount.toNumber(),
-        // 转换为数字
         deductQuantity: actualDeductQty
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
@@ -341,7 +347,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
       usedVoucherCounts.set(product_id, (usedVoucherCounts.get(product_id) || 0) + 1);
       deductionDetails.forEach((detail) => {
-        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id);
+        incrementItemPassUsage(itemPassUsageMap, product_id, detail.product_id, detail.deductQuantity);
       });
       recommendedVouchers.push({
         ...voucher,
@@ -389,18 +395,18 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     var _a;
     return ((_a = itemPassUsageMap.get(walletPassProductId)) == null ? void 0 : _a.get(orderItemProductId)) || 0;
   };
-  const incrementItemPassUsage = (walletPassProductId, orderItemProductId) => {
+  const incrementItemPassUsage = (walletPassProductId, orderItemProductId, count = 1) => {
     if (!itemPassUsageMap.has(walletPassProductId)) {
       itemPassUsageMap.set(walletPassProductId, /* @__PURE__ */ new Map());
     }
     const innerMap = itemPassUsageMap.get(walletPassProductId);
-    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + 1);
+    innerMap.set(orderItemProductId, (innerMap.get(orderItemProductId) || 0) + count);
   };
   const filterByMaxPassesPerItem = (products2, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem
+      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsForCalc, p.product_id)
     );
   };
   selectedVouchers.forEach((selectedVoucher) => {
@@ -463,14 +469,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);
@@ -480,15 +487,13 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
         parent_product_id: targetProduct.parent_product_id || null,
         is_bundle_item: targetProduct.is_bundle_item || false,
         deductAmount: actualDeductAmount.toNumber(),
-        // 转换为数字
         deductQuantity: actualDeductQty
-        // 抵扣涉及的数量（用于记录）
       });
     }
     const totalDeducted = maxDeduction.minus(deductionLeft);
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
     deductionDetails.forEach((detail) => {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id);
+      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id, detail.deductQuantity);
     });
     selectedWithDetails.push({
       ...selectedVoucher,
@@ -572,14 +577,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,

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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