@pisell/pisellos 0.0.479 → 0.0.480

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 可用的券列表
@@ -136,11 +148,11 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   };
 
   // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
-  // maxPassesPerItem 是 per-unit 的限制，总上限 = maxPassesPerItem × quantity
-  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 * getProductQuantity(p);
+      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id);
     });
   };
   // ================================================================
@@ -177,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);
@@ -219,9 +231,9 @@ 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;
       });
       // maxPassesPerItem 限制每张券最多抵扣的单位数
       if (maxPassesPerItem > 0) {
@@ -289,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 * getProductQuantity(p);
+        return getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsData, p.product_id);
       });
       if (availableAfterPassLimit.length === 0) {
         return {
@@ -386,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 ==========
@@ -428,9 +440,9 @@ 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;
       });
       // maxPassesPerItem 限制每张券最多抵扣的单位数
       if (maxPassesPerItem > 0) {
@@ -491,9 +503,9 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
         _iterator3.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（剩余金额最高的）
+      // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
 
       // maxPassesPerItem 限制每张券最多抵扣的单位数
@@ -629,7 +641,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   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 * getProductQuantity(p);
+      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsForCalc, p.product_id);
     });
   };
 
@@ -717,9 +729,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
         _iterator4.f();
       }
     } else {
-      // 非跨商品券：只抵扣一个商品（剩余金额最高的）
+      // 非跨商品券：选择单价最高的商品（优先抵扣高价商品）
       var targetProduct = applicableProducts.reduce(function (max, p) {
-        return p[amountField].greaterThan(max[amountField]) ? p : max;
+        return p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max;
       });
 
       // maxPassesPerItem 限制每张券最多抵扣的单位数
@@ -864,9 +876,9 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
               }, 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;
             });
             // maxPassesPerItem 限制每张券最多抵扣的单位数
             if (maxPassesPerItem > 0) {

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

@@ -86,6 +86,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);
@@ -101,11 +104,11 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     const innerMap = usageMap.get(walletPassProductId);
     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 * getProductQuantity(p)
+      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id)
     );
   };
   const calculateAvailableMaxAmount = (voucher, productsData, itemPassUsage) => {
@@ -120,7 +123,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);
@@ -150,7 +153,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
       if (maxPassesPerItem > 0) {
         finalApplicableAmount = import_decimal.default.min(
@@ -186,7 +189,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 * getProductQuantity(p));
+      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" };
       }
@@ -236,7 +239,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);
@@ -269,7 +272,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const maxProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
       if (maxPassesPerItem > 0) {
         calculatedAvailableMaxAmount = import_decimal.default.min(
@@ -322,7 +325,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
       let maxDeductForProduct = targetProduct[amountField];
       if (maxPassesPerItem > 0) {
@@ -407,7 +410,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getProductQuantity(p)
+      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(productsForCalc, p.product_id)
     );
   };
   selectedVouchers.forEach((selectedVoucher) => {
@@ -470,7 +473,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       }
     } else {
       const targetProduct = applicableProducts.reduce(
-        (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
+        (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
       );
       let maxDeductForProduct = targetProduct[amountField];
       if (maxPassesPerItem > 0) {
@@ -578,7 +581,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
             }
           } else {
             const maxProduct = applicableProducts.reduce(
-              (max, p) => p[amountField].greaterThan(max[amountField]) ? p : max
+              (max, p) => p[unitPriceField].greaterThan(max[unitPriceField]) ? p : max
             );
             if (maxPassesPerItem > 0) {
               calculatedMaxAmount = import_decimal.default.min(

package/package.json

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