@pisell/pisellos 0.0.479 → 0.0.481

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,29 +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;
+  // ========== 辅助工具：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;
   };
 
-  // 更新指定 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) + count);
-  };
-
-  // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
-  // maxPassesPerItem 是 per-unit 的限制，总上限 = maxPassesPerItem × quantity
+  // 按 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 * getProductQuantity(p);
+      var lineKey = p._walletPassLineKey;
+      if (!lineKey) return true;
+      return getItemPassUsage(usageMap, walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
     });
   };
   // ================================================================
@@ -219,9 +266,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 +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 * getProductQuantity(p);
+        var lineKey = p._walletPassLineKey;
+        if (!lineKey) return true;
+        return getItemPassUsage(itemPassUsage, product_id, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
       });
       if (availableAfterPassLimit.length === 0) {
         return {
@@ -325,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();
 
   /**
@@ -428,9 +477,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) {
@@ -480,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 // 抵扣涉及的数量（用于记录）
@@ -491,9 +542,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 限制每张券最多抵扣的单位数
@@ -513,6 +564,8 @@ 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
       });
@@ -524,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, detail.deductQuantity);
-      });
+      applyMaxPassUsageIncrements(itemPassUsageMap, product_id, maxPassesPerItem, deductionDetails);
 
       // 添加到推荐列表（包含基于当前剩余金额计算的 available_max_amount）
       recommendedVouchers.push(_objectSpread(_objectSpread({}, voucher), {}, {
@@ -611,25 +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;
-  };
-  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) + count);
+    return ((_itemPassUsageMap$get = itemPassUsageMap.get(walletPassProductId)) === null || _itemPassUsageMap$get === void 0 ? void 0 : _itemPassUsageMap$get.get(lineKey)) || 0;
   };
-  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 * getProductQuantity(p);
+      var lineKey = p._walletPassLineKey;
+      if (!lineKey) return true;
+      return getItemPassUsageRecalc(walletPassProductId, lineKey) < getMaxPassSlotsForExpandedLine(maxPassesPerItem, p);
     });
   };
 
@@ -654,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), {}, {
@@ -706,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 // 抵扣涉及的数量（用于记录）
@@ -717,9 +761,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 限制每张券最多抵扣的单位数
@@ -739,6 +783,8 @@ 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
       });
@@ -747,11 +793,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
 
     // 更新订单剩余金额
     remainingOrderAmount = remainingOrderAmount.minus(totalDeducted);
-
-    // 更新 maxPassesPerItem 追踪：按实际抵扣数量递增
-    deductionDetails.forEach(function (detail) {
-      incrementItemPassUsage(selectedVoucher.product_id, detail.product_id, detail.deductQuantity);
-    });
+    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,9 +906,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) {
@@ -938,7 +980,7 @@ export var getProductDiscountDifference = function getProductDiscountDifference(
  * @returns 商品单价
  */
 export var getMainProductPrice = function getMainProductPrice(product, isDeductTaxAndFee) {
-  var _product$metadata4, _product$metadata5, _product$metadata6;
+  var _product$metadata4, _product$metadata5, _product$metadata6, _product$metadata7;
   var mainProductPrice = new Decimal((product === null || product === void 0 ? void 0 : product.main_product_selling_price) || ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_selling_price) || 0);
   var _iterator6 = _createForOfIteratorHelper((product === null || product === void 0 ? void 0 : product.product_bundle) || []),
     _step6;
@@ -958,14 +1000,14 @@ export var getMainProductPrice = function getMainProductPrice(product, isDeductT
   } finally {
     _iterator6.f();
   }
-  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_attached_bundle_tax_fee) || 0);
+  var taxFee = new Decimal((product === null || product === void 0 ? void 0 : product.tax_fee) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_attached_bundle_tax_fee) || 0).add((product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.tax_fee_rounding_remainder) || 0);
   if (product.is_price_include_tax === 1) {
     taxFee = new Decimal(0);
   }
 
   // 税费
   // 附加费
-  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.main_product_attached_bundle_surcharge_fee) || 0);
+  var surchargeFee = new Decimal((product === null || product === void 0 || (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_attached_bundle_surcharge_fee) || 0);
 
   // 税费附加费总额
   var taxAndFeeTotal = taxFee.add(surchargeFee);
@@ -1047,8 +1089,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);
@@ -1063,6 +1106,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),
@@ -1079,6 +1124,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);
@@ -1096,6 +1142,8 @@ var expandProductsWithBundleItems = function expandProductsWithBundleItems(produ
             parent_product_id: product.product_id,
             quantity: bundleQuantity,
             // 子商品数量 * 主商品数量
+            _walletPassLineKey: bundleLineKey,
+            _orderLineQuantity: bundleQuantity,
             // 单价（用于按 quantity 计算抵扣）
             unitPriceWithTax: bundleUnitPriceWithTax,
             unitPricePure: bundleUnitPricePure,
@@ -1113,15 +1161,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/Customer/index.js

@@ -171,7 +171,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.get(url, queryParams, {
                 cache: {
                   mode: RequestModeENUM.REMOTE_LOCAL,
-                  type: "indexDB"
+                  type: "memory"
                 }
               });
             case 7:

package/dist/modules/Discount/index.d.ts

@@ -17,14 +17,18 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'update';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
+    }): Promise<Discount[]>;
+    batchSearch(code: string, options?: {
+        customerId?: number;
+        orderId?: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;

package/dist/modules/Discount/index.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -176,13 +178,14 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "batchSearch",
     value: function () {
-      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var result, resultDiscountList;
+      var _batchSearch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, options) {
+        var _ref, customerId, orderId, result, resultDiscountList;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.next = 2;
-              return this.request.get("/machinecode/batch-search", {
+              _ref = options || {}, customerId = _ref.customerId, orderId = _ref.orderId;
+              _context5.next = 3;
+              return this.request.get("/machinecode/batch-search", _objectSpread(_objectSpread({
                 code: code,
                 translate_flag: 1,
                 tags: ['good_pass', 'product_discount_card'],
@@ -190,14 +193,17 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 relation_product: 1,
                 with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
                 order_behavior_count: 1,
-                order_behavior_count_customer_id: customerId || 1,
+                order_behavior_count_customer_id: customerId || 1
+              }, orderId ? {
+                order_behavior_count_order_id: orderId
+              } : {}), {}, {
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 2:
+              }));
+            case 3:
               result = _context5.sent;
               resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
               return _context5.abrupt("return", resultDiscountList);
-            case 5:
+            case 6:
             case "end":
               return _context5.stop();
           }

package/dist/modules/Order/index.d.ts

@@ -23,7 +23,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private logError;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -250,11 +250,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrderByCheckout",
     value: (function () {
       var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _params$bookings2, _params$relation_prod2, _params$payments, _params$payments2, _params$bookings3, _params$relation_prod3, _params$payments3;
-        var _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
+        var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
+        var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              // 过滤掉由在线店铺下单的 payment 支付数据
+              onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
+              params.payments = (_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.filter(function (p) {
+                return !onlineStorePaymentCodeList.includes(p.code);
+              });
               this.logInfo('createOrderByCheckout called', {
                 type: params.type,
                 platform: params.platform,
@@ -262,14 +267,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 customer_id: params.customer_id,
                 bookingsCount: ((_params$bookings2 = params.bookings) === null || _params$bookings2 === void 0 ? void 0 : _params$bookings2.length) || 0,
                 relationProductsCount: ((_params$relation_prod2 = params.relation_products) === null || _params$relation_prod2 === void 0 ? void 0 : _params$relation_prod2.length) || 0,
-                paymentsCount: ((_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.length) || 0,
+                paymentsCount: ((_params$payments2 = params.payments) === null || _params$payments2 === void 0 ? void 0 : _params$payments2.length) || 0,
                 depositAmount: params.deposit_amount,
                 productTaxFee: params.product_tax_fee,
                 note: params.note,
                 scheduleDate: params.schedule_date,
                 hasOrderId: !!params.order_id,
                 orderIdIncluded: params.order_id,
-                paymentMethods: ((_params$payments2 = params.payments) === null || _params$payments2 === void 0 ? void 0 : _params$payments2.map(function (p) {
+                paymentMethods: ((_params$payments3 = params.payments) === null || _params$payments3 === void 0 ? void 0 : _params$payments3.map(function (p) {
                   return p.code;
                 })) || []
               });
@@ -280,9 +285,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 customer_id: params.customer_id,
                 bookingsCount: ((_params$bookings3 = params.bookings) === null || _params$bookings3 === void 0 ? void 0 : _params$bookings3.length) || 0,
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
-                paymentsCount: ((_params$payments3 = params.payments) === null || _params$payments3 === void 0 ? void 0 : _params$payments3.length) || 0
+                paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context3.prev = 2;
+              _context3.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -346,9 +351,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context3.next = 10;
+              _context3.next = 12;
               return this.request.post('/order/checkout', orderData);
-            case 10:
+            case 12:
               response = _context3.sent;
               this.logInfo('Order API called successfully', {
                 response: response
@@ -358,19 +363,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
               return _context3.abrupt("return", response);
-            case 16:
-              _context3.prev = 16;
-              _context3.t0 = _context3["catch"](2);
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](4);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
               this.logInfo('Order API called failed', {
                 error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
               });
               throw _context3.t0;
-            case 21:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 16]]);
+        }, _callee3, this, [[4, 18]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

package/dist/modules/Payment/index.d.ts

@@ -24,11 +24,14 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     window: WindowPlugin;
     private dbManager;
     private logger;
+    private voucherUpdateLockByOrderUuid;
     protected otherParams: any;
     cash: CashPayment;
     eftpos: EftposPayment;
     wallet: WalletPassPayment;
     constructor(name?: string, version?: string);
+    private runVoucherUpdateLocked;
+    private normalizeVoucherPaymentItems;
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
      * 记录信息日志
@@ -51,6 +54,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      *
      */
     private registerNetworkHandlers;
+    private filterPayMethods;
     /**
      * 获取支付方式列表
      */