@pisell/pisellos 0.0.478 → 0.0.479

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

@@ -125,13 +125,14 @@ 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 过滤商品：排除已达到单商品可用卡券上限的商品
@@ -222,8 +223,12 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       var maxProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      // allowCrossProduct=false 时，applicableProductLimit 不生效，直接使用全部可抵扣数量
-      finalApplicableAmount = maxProduct[amountField];
+      // maxPassesPerItem 限制每张券最多抵扣的单位数
+      if (maxPassesPerItem > 0) {
+        finalApplicableAmount = Decimal.min(maxProduct[unitPriceField].times(maxPassesPerItem), maxProduct[amountField]);
+      } else {
+        finalApplicableAmount = maxProduct[amountField];
+      }
     }
 
     // 返回最小值
@@ -427,8 +432,12 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       var maxProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      // allowCrossProduct=false 时，applicableProductLimit 不生效，直接使用全部剩余金额
-      calculatedAvailableMaxAmount = maxProduct[amountField];
+      // maxPassesPerItem 限制每张券最多抵扣的单位数
+      if (maxPassesPerItem > 0) {
+        calculatedAvailableMaxAmount = Decimal.min(maxProduct[unitPriceField].times(maxPassesPerItem), maxProduct[amountField]);
+      } else {
+        calculatedAvailableMaxAmount = maxProduct[amountField];
+      }
     }
 
     // 取最小值：min(recommended_usage_amount, maxDeductionAmount, 适用商品金额, 订单剩余金额)
@@ -483,11 +492,16 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       }
     } else {
       // 非跨商品券：只抵扣一个商品（剩余金额最高的）
-      // allowCrossProduct=false 时，applicableProductLimit 不生效
       var targetProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      var _actualDeductAmount = Decimal.min(deductionLeft, 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);
 
       // 计算实际抵扣的数量
       var _actualDeductQty = Math.ceil(_actualDeductAmount.dividedBy(targetProduct[unitPriceField]).toNumber());
@@ -511,9 +525,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）
@@ -605,11 +619,12 @@ 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 = 不限制
@@ -703,11 +718,16 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
       }
     } else {
       // 非跨商品券：只抵扣一个商品（剩余金额最高的）
-      // allowCrossProduct=false 时，applicableProductLimit 不生效
       var targetProduct = applicableProducts.reduce(function (max, p) {
         return p[amountField].greaterThan(max[amountField]) ? p : max;
       });
-      var _actualDeductAmount2 = Decimal.min(deductionLeft, 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);
 
       // 计算实际抵扣的数量
       var _actualDeductQty2 = Math.ceil(_actualDeductAmount2.dividedBy(targetProduct[unitPriceField]).toNumber());
@@ -728,9 +748,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(),
@@ -845,11 +865,15 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
             }
           } else {
             // 非跨商品券：单个剩余金额最高的商品
-            // allowCrossProduct=false 时，applicableProductLimit 不生效
             var maxProduct = applicableProducts.reduce(function (max, p) {
               return p[amountField].greaterThan(max[amountField]) ? p : max;
             });
-            calculatedMaxAmount = 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/lib/model/strategy/adapter/walletPass/utils.js

@@ -94,12 +94,12 @@ 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) => {
     if (maxPassesPerItem <= 0)
@@ -152,7 +152,14 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       const maxProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      finalApplicableAmount = maxProduct[amountField];
+      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);
   };
@@ -264,7 +271,14 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       const maxProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      calculatedAvailableMaxAmount = maxProduct[amountField];
+      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,
@@ -310,7 +324,14 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       const targetProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      const actualDeductAmount = import_decimal.default.min(deductionLeft, targetProduct[amountField]);
+      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);
       deductionLeft = deductionLeft.minus(actualDeductAmount);
@@ -327,7 +348,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,
@@ -375,12 +396,12 @@ 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)
@@ -451,7 +472,14 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       const targetProduct = applicableProducts.reduce(
         (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
       );
-      const actualDeductAmount = import_decimal.default.min(deductionLeft, targetProduct[amountField]);
+      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);
       deductionLeft = deductionLeft.minus(actualDeductAmount);
@@ -466,7 +494,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     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,
@@ -552,7 +580,14 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
             const maxProduct = applicableProducts.reduce(
               (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
             );
-            calculatedMaxAmount = maxProduct[amountField];
+            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/package.json

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