@pisell/pisellos 0.0.480 → 0.0.481

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

@@ -42,10 +42,72 @@ __export(utils_exports, {
   getProductQuantity: () => getProductQuantity,
   getTaxAndFeeRoundingRemainder: () => getTaxAndFeeRoundingRemainder,
   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;
@@ -86,30 +148,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;
-  };
-  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);
+    return ((_a = usageMap.get(walletPassProductId)) == null ? void 0 : _a.get(lineKey)) || 0;
   };
-  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;
@@ -123,7 +178,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);
@@ -189,7 +244,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" };
       }
@@ -239,7 +299,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);
@@ -317,6 +377,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
@@ -342,6 +404,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
       });
@@ -350,9 +414,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(),
@@ -395,23 +457,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;
@@ -422,7 +480,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,
@@ -465,6 +523,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
@@ -490,15 +550,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(),
@@ -548,7 +608,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";
@@ -634,7 +694,7 @@ var getProductDiscountDifference = (product) => {
   return new import_decimal.default(((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.product_discount_difference) || 0).toNumber();
 };
 var getMainProductPrice = (product, isDeductTaxAndFee) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   let mainProductPrice = new import_decimal.default((product == null ? void 0 : product.main_product_selling_price) || ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) || 0);
   for (let bundleItem of (product == null ? void 0 : product.product_bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
@@ -642,11 +702,11 @@ var getMainProductPrice = (product, isDeductTaxAndFee) => {
       mainProductPrice = mainProductPrice.add(bundleItemPrice.times(bundleItem.num));
     }
   }
-  let taxFee = new import_decimal.default((product == null ? void 0 : product.tax_fee) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.main_product_attached_bundle_tax_fee) || 0);
+  let taxFee = new import_decimal.default((product == null ? void 0 : product.tax_fee) || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.main_product_attached_bundle_tax_fee) || 0).add(((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.tax_fee_rounding_remainder) || 0);
   if (product.is_price_include_tax === 1) {
     taxFee = new import_decimal.default(0);
   }
-  const surchargeFee = new import_decimal.default(((_c = product == null ? void 0 : product.metadata) == null ? void 0 : _c.main_product_attached_bundle_surcharge_fee) || 0);
+  const surchargeFee = new import_decimal.default(((_d = product == null ? void 0 : product.metadata) == null ? void 0 : _d.main_product_attached_bundle_surcharge_fee) || 0);
   const taxAndFeeTotal = taxFee.add(surchargeFee);
   if (isDeductTaxAndFee) {
     mainProductPrice = mainProductPrice.add(taxAndFeeTotal);
@@ -685,8 +745,9 @@ 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);
     const roundingRemainderWithTax = getTaxAndFeeRoundingRemainder(product, true);
@@ -695,6 +756,8 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
       ...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),
@@ -709,6 +772,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);
           const bundleRoundingRemainder = getBundleItemTaxAndFeeRoundingRemainder(bundleItem, true);
@@ -721,6 +785,8 @@ var expandProductsWithBundleItems = (products, deductTaxAndFee) => {
             parent_product_id: product.product_id,
             quantity: bundleQuantity,
             // 子商品数量 * 主商品数量
+            _walletPassLineKey: bundleLineKey,
+            _orderLineQuantity: bundleQuantity,
             // 单价（用于按 quantity 计算抵扣）
             unitPriceWithTax: bundleUnitPriceWithTax,
             unitPricePure: bundleUnitPricePure,
@@ -737,9 +803,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";
 };
@@ -767,5 +830,6 @@ var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   getProductQuantity,
   getTaxAndFeeRoundingRemainder,
   processVouchers,
-  recalculateVouchers
+  recalculateVouchers,
+  resolveWalletPassLineKey
 });

package/lib/modules/Customer/index.js

@@ -116,7 +116,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     const res = await this.request.get(url, queryParams, {
       cache: {
         mode: import_plugins.RequestModeENUM.REMOTE_LOCAL,
-        type: "indexDB"
+        type: "memory"
       }
     });
     if ((res == null ? void 0 : res.code) !== 200) {

package/lib/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/lib/modules/Discount/index.js

@@ -102,7 +102,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     ) || [];
     return goodPassList;
   }
-  async batchSearch(code, customerId) {
+  async batchSearch(code, options) {
+    const { customerId, orderId } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
@@ -112,6 +113,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1,
+      ...orderId ? { order_behavior_count_order_id: orderId } : {},
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];

package/lib/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/lib/modules/Order/index.js

@@ -195,31 +195,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的订单数据（包含订单ID等）
    */
   async createOrderByCheckout(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    const onlineStorePaymentCodeList = ["WXPAY", "WECHAT", "ALIPAY", "APPLE_PAY", "CREDIT_CARD_3DS", "CREDIT_CARD_TOKEN", "GOOGLE_PAY", "GOOGLE_PAY_3DS", "CREDIT_CARD"];
+    params.payments = (_a = params.payments) == null ? void 0 : _a.filter((p) => !onlineStorePaymentCodeList.includes(p.code));
     this.logInfo("createOrderByCheckout called", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
-      bookingsCount: ((_a = params.bookings) == null ? void 0 : _a.length) || 0,
-      relationProductsCount: ((_b = params.relation_products) == null ? void 0 : _b.length) || 0,
-      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0,
+      bookingsCount: ((_b = params.bookings) == null ? void 0 : _b.length) || 0,
+      relationProductsCount: ((_c = params.relation_products) == null ? void 0 : _c.length) || 0,
+      paymentsCount: ((_d = params.payments) == null ? void 0 : _d.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: ((_d = params.payments) == null ? void 0 : _d.map((p) => p.code)) || []
+      paymentMethods: ((_e = params.payments) == null ? void 0 : _e.map((p) => p.code)) || []
     });
     console.log("[Order] createOrderByCheckout 开始创建订单:", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
-      bookingsCount: ((_e = params.bookings) == null ? void 0 : _e.length) || 0,
-      relationProductsCount: ((_f = params.relation_products) == null ? void 0 : _f.length) || 0,
-      paymentsCount: ((_g = params.payments) == null ? void 0 : _g.length) || 0
+      bookingsCount: ((_f = params.bookings) == null ? void 0 : _f.length) || 0,
+      relationProductsCount: ((_g = params.relation_products) == null ? void 0 : _g.length) || 0,
+      paymentsCount: ((_h = params.payments) == null ? void 0 : _h.length) || 0
     });
     try {
       const orderData = {
@@ -236,7 +238,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...params
         // 使用传入的参数覆盖默认值
       };
-      if ((_h = orderData.payments) == null ? void 0 : _h.length) {
+      if ((_i = orderData.payments) == null ? void 0 : _i.length) {
         orderData.small_ticket_data_flag = 1;
       }
       if (!params.order_id && !orderData.schedule_date) {
@@ -248,10 +250,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         platform: orderData.platform,
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
-        bookingsCount: ((_i = orderData.bookings) == null ? void 0 : _i.length) || 0,
-        relationProductsCount: ((_j = orderData.relation_products) == null ? void 0 : _j.length) || 0,
-        paymentsCount: ((_k = orderData.payments) == null ? void 0 : _k.length) || 0,
-        paymentsMethods: ((_l = orderData.payments) == null ? void 0 : _l.map((p) => p.code)) || []
+        bookingsCount: ((_j = orderData.bookings) == null ? void 0 : _j.length) || 0,
+        relationProductsCount: ((_k = orderData.relation_products) == null ? void 0 : _k.length) || 0,
+        paymentsCount: ((_l = orderData.payments) == null ? void 0 : _l.length) || 0,
+        paymentsMethods: ((_m = orderData.payments) == null ? void 0 : _m.map((p) => p.code)) || []
       });
       this.logInfo("Calling backend checkout API", {
         url: "/order/checkout",
@@ -260,10 +262,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
         depositAmount: orderData.deposit_amount,
-        bookingsCount: ((_m = orderData.bookings) == null ? void 0 : _m.length) || 0,
-        relationProductsCount: ((_n = orderData.relation_products) == null ? void 0 : _n.length) || 0,
-        paymentsCount: ((_o = orderData.payments) == null ? void 0 : _o.length) || 0,
-        paymentMethods: ((_p = orderData.payments) == null ? void 0 : _p.map((p) => ({
+        bookingsCount: ((_n = orderData.bookings) == null ? void 0 : _n.length) || 0,
+        relationProductsCount: ((_o = orderData.relation_products) == null ? void 0 : _o.length) || 0,
+        paymentsCount: ((_p = orderData.payments) == null ? void 0 : _p.length) || 0,
+        paymentMethods: ((_q = orderData.payments) == null ? void 0 : _q.map((p) => ({
           code: p.code,
           amount: p.amount,
           type: p.type,
@@ -282,7 +284,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       console.log("[Order] 订单创建成功，后端响应:", {
         success: !!response,
-        hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
+        hasOrderId: !!(((_r = response == null ? void 0 : response.data) == null ? void 0 : _r.order_id) || (response == null ? void 0 : response.order_id))
       });
       return response;
     } catch (error) {

package/lib/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;
     /**
      * 获取支付方式列表
      */