@pisell/pisellos 2.2.19 → 2.2.21

package/dist/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/ShopDiscount/index.js

@@ -270,14 +270,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              if (!(this.isWalkIn() && this.isWalkIn(customer === null || customer === void 0 ? void 0 : customer.id))) {
+                _context4.next = 2;
+                break;
+              }
+              return _context4.abrupt("return");
+            case 2:
               if (!(((_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 ? void 0 : _this$store$customer.id) !== customer.id)) {
-                _context4.next = 4;
+                _context4.next = 6;
                 break;
               }
               this.store.customer = customer;
-              _context4.next = 4;
+              _context4.next = 6;
               return this.core.effects.emit("".concat(this.name, ":onCustomerChange"), customer);
-            case 4:
+            case 6:
             case "end":
               return _context4.stop();
           }
@@ -522,9 +528,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     // 是否是walkIn
   }, {
     key: "isWalkIn",
-    value: function isWalkIn() {
+    value: function isWalkIn(id) {
       var _this$getCustomer;
-      return (((_this$getCustomer = this.getCustomer()) === null || _this$getCustomer === void 0 ? void 0 : _this$getCustomer.id) || 1) === 1;
+      return (id !== null && id !== void 0 ? id : ((_this$getCustomer = this.getCustomer()) === null || _this$getCustomer === void 0 ? void 0 : _this$getCustomer.id) || 1) === 1;
     }
 
     // 触发优惠列表变更事件

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

@@ -23,11 +23,14 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     private store;
     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>;
     /**
      * 记录信息日志

package/lib/modules/Payment/index.js

@@ -68,11 +68,38 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.defaultName = "pay";
     this.defaultVersion = "1.0.0";
     // LoggerManager 实例
+    this.voucherUpdateLockByOrderUuid = /* @__PURE__ */ new Map();
     this.otherParams = {};
     this.cash = new import_cash.CashPaymentImpl(this);
     this.eftpos = new import_eftpos.EftposPaymentImpl(this);
     this.wallet = new import_walletpass.WalletPassPaymentImpl(this);
   }
+  runVoucherUpdateLocked(orderUuid, task) {
+    const previous = this.voucherUpdateLockByOrderUuid.get(orderUuid) || Promise.resolve();
+    const next = previous.catch(() => void 0).then(task).finally(() => {
+      if (this.voucherUpdateLockByOrderUuid.get(orderUuid) === next) {
+        this.voucherUpdateLockByOrderUuid.delete(orderUuid);
+      }
+    });
+    this.voucherUpdateLockByOrderUuid.set(orderUuid, next);
+    return next;
+  }
+  normalizeVoucherPaymentItems(voucherPaymentItems) {
+    const normalized = /* @__PURE__ */ new Map();
+    for (const item of voucherPaymentItems || []) {
+      if (!(item == null ? void 0 : item.voucher_id)) {
+        throw new Error(`代金券支付项缺少 voucher_id: ${JSON.stringify(item)}`);
+      }
+      const orderPaymentType = item.order_payment_type || "normal";
+      const key = `${item.voucher_id}|${orderPaymentType}`;
+      normalized.set(key, { ...item, order_payment_type: orderPaymentType });
+    }
+    return {
+      items: Array.from(normalized.values()),
+      originalCount: (voucherPaymentItems == null ? void 0 : voucherPaymentItems.length) || 0,
+      normalizedCount: normalized.size
+    };
+  }
   async initialize(core, options) {
     this.core = core;
     this.store = options.store;
@@ -726,76 +753,102 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
    * 这是一个覆盖式更新，确保代金券支付项的一致性
    */
   async updateVoucherPaymentItemsAsync(orderUuid, voucherPaymentItems) {
-    this.logInfo("Starting updateVoucherPaymentItemsAsync", {
-      orderUuid,
-      newVoucherCount: voucherPaymentItems.length,
-      voucherItems: voucherPaymentItems.map((item) => ({
-        code: item.code,
-        amount: item.amount,
-        voucher_id: item.voucher_id,
-        order_payment_type: item.order_payment_type
-      }))
-    });
-    try {
-      const order = await this.getPaymentOrderByUuidAsync(orderUuid);
-      if (!order) {
-        throw new Error(`订单不存在: ${orderUuid}`);
-      }
-      const existingVoucherItems = order.payment.filter(
-        (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
-      );
-      console.log("[PaymentModule] 发现现有代金券支付项:", {
+    return this.runVoucherUpdateLocked(orderUuid, async () => {
+      const { items: normalizedVoucherItems, originalCount, normalizedCount } = this.normalizeVoucherPaymentItems(voucherPaymentItems);
+      this.logInfo("Starting updateVoucherPaymentItemsAsync", {
         orderUuid,
-        existingVoucherCount: existingVoucherItems.length,
-        existingItems: existingVoucherItems.map((item) => ({
-          uuid: item.uuid,
+        originalVoucherCount: originalCount,
+        normalizedVoucherCount: normalizedCount,
+        voucherItems: normalizedVoucherItems.map((item) => ({
           code: item.code,
           amount: item.amount,
           voucher_id: item.voucher_id,
-          isSynced: item.isSynced
+          order_payment_type: item.order_payment_type
         }))
       });
-      for (const voucherItem of existingVoucherItems) {
-        console.log(`[PaymentModule] 删除现有代金券支付项: ${voucherItem.uuid}`);
-        await this.deletePaymentAsync(orderUuid, voucherItem.uuid);
+      if (originalCount !== normalizedCount) {
+        console.warn("[PaymentModule] voucherPaymentItems detected duplicates (deduped by voucher_id + order_payment_type)", {
+          orderUuid,
+          originalCount,
+          normalizedCount
+        });
       }
-      console.log("[PaymentModule] 添加新的代金券支付项:", {
-        orderUuid,
-        newItemCount: voucherPaymentItems.length
-      });
-      for (const voucherItem of voucherPaymentItems) {
-        if (!voucherItem.voucher_id) {
-          throw new Error(`代金券支付项缺少 voucher_id: ${JSON.stringify(voucherItem)}`);
+      try {
+        const order = await this.getPaymentOrderByUuidAsync(orderUuid);
+        if (!order) {
+          throw new Error(`订单不存在: ${orderUuid}`);
+        }
+        const existingVoucherItems = order.payment.filter(
+          (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
+        );
+        console.log("[PaymentModule] 发现现有代金券支付项:", {
+          orderUuid,
+          existingVoucherCount: existingVoucherItems.length,
+          existingItems: existingVoucherItems.map((item) => ({
+            uuid: item.uuid,
+            code: item.code,
+            amount: item.amount,
+            voucher_id: item.voucher_id,
+            isSynced: item.isSynced
+          }))
+        });
+        for (const voucherItem of existingVoucherItems) {
+          console.log(`[PaymentModule] 删除现有代金券支付项: ${voucherItem.uuid}`);
+          await this.deletePaymentAsync(orderUuid, voucherItem.uuid);
         }
-        console.log(`[PaymentModule] 添加代金券支付项:`, {
-          code: voucherItem.code,
-          amount: voucherItem.amount,
-          voucher_id: voucherItem.voucher_id,
-          order_payment_type: voucherItem.order_payment_type
+        const orderAfterDelete = await this.getPaymentOrderByUuidAsync(orderUuid);
+        if (!orderAfterDelete) {
+          throw new Error(`订单不存在: ${orderUuid}`);
+        }
+        const existingActiveVoucherKeys = new Set(
+          orderAfterDelete.payment.filter((p) => p.voucher_id && p.status !== "voided").map((p) => `${p.voucher_id}|${p.order_payment_type || "normal"}`)
+        );
+        console.log("[PaymentModule] 添加新的代金券支付项:", {
+          orderUuid,
+          newItemCount: normalizedVoucherItems.length
+        });
+        for (const voucherItem of normalizedVoucherItems) {
+          const orderPaymentType = voucherItem.order_payment_type || "normal";
+          const key = `${voucherItem.voucher_id}|${orderPaymentType}`;
+          if (existingActiveVoucherKeys.has(key)) {
+            console.warn("[PaymentModule] Skip adding voucher payment item because it already exists (active)", {
+              orderUuid,
+              voucher_id: voucherItem.voucher_id,
+              order_payment_type: orderPaymentType
+            });
+            continue;
+          }
+          console.log(`[PaymentModule] 添加代金券支付项:`, {
+            code: voucherItem.code,
+            amount: voucherItem.amount,
+            voucher_id: voucherItem.voucher_id,
+            order_payment_type: orderPaymentType
+          });
+          await this.addPaymentItemAsync(orderUuid, voucherItem);
+          existingActiveVoucherKeys.add(key);
+        }
+        const updatedOrder = await this.getPaymentOrderByUuidAsync(orderUuid);
+        await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+          orderUuid,
+          order: updatedOrder,
+          payment: null
+          // 批量操作不提供单个支付项
+        });
+        this.logInfo("updateVoucherPaymentItemsAsync completed successfully", {
+          orderUuid,
+          removedVoucherCount: existingVoucherItems.length,
+          addedVoucherCount: normalizedVoucherItems.length,
+          finalExpectAmount: updatedOrder == null ? void 0 : updatedOrder.expect_amount
+        });
+      } catch (error) {
+        console.error("[PaymentModule] 批量更新代金券支付项失败:", error);
+        this.logError("updateVoucherPaymentItemsAsync failed", error, {
+          orderUuid,
+          voucherPaymentItems
         });
-        await this.addPaymentItemAsync(orderUuid, voucherItem);
+        throw error;
       }
-      const updatedOrder = await this.getPaymentOrderByUuidAsync(orderUuid);
-      await this.core.effects.emit(`${this.name}:onPaymentAdded`, {
-        orderUuid,
-        order: updatedOrder,
-        payment: null
-        // 批量操作不提供单个支付项
-      });
-      this.logInfo("updateVoucherPaymentItemsAsync completed successfully", {
-        orderUuid,
-        removedVoucherCount: existingVoucherItems.length,
-        addedVoucherCount: voucherPaymentItems.length,
-        finalExpectAmount: updatedOrder == null ? void 0 : updatedOrder.expect_amount
-      });
-    } catch (error) {
-      console.error("[PaymentModule] 批量更新代金券支付项失败:", error);
-      this.logError("updateVoucherPaymentItemsAsync failed", error, {
-        orderUuid,
-        voucherPaymentItems
-      });
-      throw error;
-    }
+    });
   }
   /**
    * 更新一个支付项

package/lib/solution/BookingTicket/index.d.ts

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/ShopDiscount/index.js

@@ -185,6 +185,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 设置客户
   async setCustomer(customer) {
     var _a;
+    if (this.isWalkIn() && this.isWalkIn(customer == null ? void 0 : customer.id)) {
+      return;
+    }
     if (((_a = this.store.customer) == null ? void 0 : _a.id) !== customer.id) {
       this.store.customer = customer;
       await this.core.effects.emit(
@@ -348,9 +351,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     return this.store.customer;
   }
   // 是否是walkIn
-  isWalkIn() {
+  isWalkIn(id) {
     var _a;
-    return (((_a = this.getCustomer()) == null ? void 0 : _a.id) || 1) === 1;
+    return (id ?? (((_a = this.getCustomer()) == null ? void 0 : _a.id) || 1)) === 1;
   }
   // 触发优惠列表变更事件
   async emitDiscountListChange(discountList) {

package/package.json

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