@pisell/pisellos 2.1.107 → 2.1.109

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;
@@ -82,30 +144,23 @@ 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);
   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;
+    return ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(lineKey)) || 0;
   };
-  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) + count);
-  };
-  const filterByMaxPassesPerItem = (products2, allProducts, usageMap, walletPassProductId, maxPassesPerItem) => {
+  const filterByMaxPassesPerItem = (products2, usageMap, walletPassProductId, maxPassesPerItem) => {
     if (maxPassesPerItem <= 0)
       return products2;
-    return products2.filter(
-      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getTotalQuantityByProductId(allProducts, p.product_id)
-    );
+    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;
@@ -119,7 +174,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, productsData, itemPassUsage, voucher.product_id, maxPassesPerItem);
+      applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsage, voucher.product_id, maxPassesPerItem);
     }
     if (applicableProducts.length === 0) {
       return new import_decimal.default(0);
@@ -185,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 * getTotalQuantityByProductId(productsData, p.product_id));
+      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" };
       }
@@ -235,7 +295,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
       voucher,
       productsForRecommendation
     ).filter((p) => p[amountField].greaterThan(0));
-    applicableProducts = filterByMaxPassesPerItem(applicableProducts, productsForRecommendation, itemPassUsageMap, product_id, maxPassesPerItem);
+    applicableProducts = filterByMaxPassesPerItem(applicableProducts, itemPassUsageMap, product_id, maxPassesPerItem);
     if (applicableProducts.length === 0)
       return false;
     const usageAmount = typeof voucher.edit_current_amount === "number" ? voucher.edit_current_amount : getRecommendedAmount(voucher);
@@ -313,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
@@ -338,6 +400,8 @@ 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
       });
@@ -346,9 +410,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     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, detail.deductQuantity);
-      });
+      applyMaxPassUsageIncrements(itemPassUsageMap, product_id, maxPassesPerItem, deductionDetails);
       recommendedVouchers.push({
         ...voucher,
         actualDeduction: totalDeducted.toNumber(),
@@ -391,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;
+    return ((_a = itemPassUsageMap.get(walletPassProductId)) == null ? void 0 : _a.get(lineKey)) || 0;
   };
-  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) + count);
-  };
-  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 * getTotalQuantityByProductId(productsForCalc, p.product_id)
-    );
+    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;
@@ -418,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,
@@ -461,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
@@ -486,15 +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, detail.deductQuantity);
-    });
+    applyMaxPassUsageIncrements(itemPassUsageMap, selectedVoucher.product_id, maxPassesPerItem, deductionDetails);
     selectedWithDetails.push({
       ...selectedVoucher,
       actualDeduction: totalDeducted.toNumber(),
@@ -544,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";
@@ -649,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),
@@ -671,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({
@@ -681,6 +745,8 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
             parent_product_id: product.product_id,
             quantity: bundleQuantity,
             // 子商品数量 * 主商品数量
+            _walletPassLineKey: bundleLineKey,
+            _orderLineQuantity: bundleQuantity,
             // 单价（用于按 quantity 计算抵扣）
             unitPriceWithTax: bundleUnitPriceWithTax,
             unitPricePure: bundleUnitPricePure,
@@ -697,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";
 };
@@ -723,5 +786,6 @@ var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   getMainProductPrice,
   getProductQuantity,
   processVouchers,
-  recalculateVouchers
+  recalculateVouchers,
+  resolveWalletPassLineKey
 });

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

@@ -46,6 +46,18 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
 var import_utils2 = require("../../../solution/ShopDiscount/utils");
 var import_utils3 = require("../../Summary/utils");
+var toDiscountPayload = (discountItem) => {
+  var _a, _b;
+  return {
+    amount: discountItem.amount,
+    tag: discountItem.type,
+    par_value: (_a = discountItem.discount) == null ? void 0 : _a.percent,
+    config: discountItem.config,
+    metadata: {
+      discount_card_type: (_b = discountItem == null ? void 0 : discountItem.discount) == null ? void 0 : _b.discount_card_type
+    }
+  };
+};
 var handleVariantProduct = (product) => {
   var _a;
   if (product == null ? void 0 : product.product_variant_id) {
@@ -192,18 +204,24 @@ var formatProductToCartItemOrigin = (params) => {
 var getProductTotalPrice = (params) => {
   const { product, bundle, options, discounts } = params;
   let price = Number(product.price);
+  const optionRows = (options == null ? void 0 : options.map((currentValue) => ({
+    unit: Number(currentValue.price ?? currentValue.add_price ?? 0),
+    num: Number(currentValue.num ?? currentValue.quantity ?? 1)
+  }))) ?? [];
   if (discounts == null ? void 0 : discounts.length) {
     discounts.forEach((currentValue) => {
       var _a;
-      price = (0, import_utils2.getDiscountAmount)({
-        amount: currentValue.amount,
-        tag: currentValue.type,
-        par_value: currentValue.discount.percent,
-        config: currentValue.config,
-        metadata: {
-          discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
+      const payload = toDiscountPayload(currentValue);
+      price = (0, import_utils2.getDiscountAmount)(payload, price, price);
+      if (((_a = currentValue == null ? void 0 : currentValue.config) == null ? void 0 : _a.deductOptionPrice) && optionRows.length) {
+        for (let i = 0; i < optionRows.length; i++) {
+          const row = optionRows[i];
+          optionRows[i] = {
+            ...row,
+            unit: (0, import_utils2.getDiscountAmount)(payload, row.unit, row.unit)
+          };
         }
-      }, price, price);
+      }
     });
   }
   if (bundle == null ? void 0 : bundle.length) {
@@ -211,10 +229,11 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  if (options == null ? void 0 : options.length) {
-    price = options.reduce((accumulator, currentValue) => {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
-    }, price);
+  if (optionRows.length) {
+    price = optionRows.reduce(
+      (accumulator, row) => accumulator + row.unit * row.num,
+      price
+    );
   }
   return Math.max(0, price);
 };

package/lib/modules/Discount/types.d.ts

@@ -120,6 +120,8 @@ export interface Discount {
         allowCrossProduct?: boolean;
         /** 可用商品数量上限 */
         applicableProductLimit?: number;
+        /** 是否抵扣单规格价格 (Option Price) */
+        deductOptionPrice?: boolean;
     };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];