@pisell/pisellos 2.2.24 → 2.2.25

package/dist/modules/Summary/utils.d.ts

@@ -21,7 +21,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

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

@@ -343,7 +343,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -20,6 +20,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private otherParams;
     private logger;
     private calculationCache;
+    private syncOrderToBackendInFlightByOrderKey;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);

package/dist/solution/Checkout/index.js

@@ -61,6 +61,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     // LoggerManager 实例
     // 计算缓存（用于性能优化）
     _defineProperty(_assertThisInitialized(_this), "calculationCache", {});
+    // 同步订单到后端锁（按订单维度），防止短时间内重复触发导致同一订单多次同步
+    _defineProperty(_assertThisInitialized(_this), "syncOrderToBackendInFlightByOrderKey", new Map());
     // 直接挂载的模块
     _defineProperty(_assertThisInitialized(_this), "order", void 0);
     _defineProperty(_assertThisInitialized(_this), "payment", void 0);
@@ -3760,7 +3762,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
-        var _this6 = this,
+        var _this6 = this;
+        var isManual,
+          customPaymentItems,
+          paymentStatus,
+          orderLockKey,
+          existingInFlight,
+          resolveInFlight,
+          rejectInFlight,
+          inFlightPromise,
           _this$store$currentOr26,
           _this$store$currentOr27,
           _this$store$currentCu2,
@@ -3768,10 +3778,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _this$store$localOrde,
           _this$store$localOrde2,
           _checkoutResponse3,
-          _checkoutResponse4;
-        var isManual,
-          customPaymentItems,
-          paymentStatus,
+          _checkoutResponse4,
           currentOrderId,
           isUpdateOperation,
           paymentItems,
@@ -3804,6 +3811,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _iterator3,
           _step3,
           paymentUuid,
+          result,
+          currentInFlight,
           _args39 = arguments;
         return _regeneratorRuntime().wrap(function _callee39$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
@@ -3817,6 +3826,36 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('缺少必要的订单数据，无法同步到后端');
             case 5:
+              orderLockKey = this.store.currentOrder.uuid || this.store.currentOrder.order_id;
+              if (orderLockKey) {
+                _context39.next = 8;
+                break;
+              }
+              throw new Error('缺少订单标识，无法同步到后端');
+            case 8:
+              existingInFlight = this.syncOrderToBackendInFlightByOrderKey.get(orderLockKey);
+              if (!existingInFlight) {
+                _context39.next = 14;
+                break;
+              }
+              this.logInfo('syncOrderToBackendWithReturn 触发锁：当前订单正在同步中，将等待当前同步结束', {
+                orderLockKey: orderLockKey,
+                orderUuid: this.store.currentOrder.uuid,
+                orderId: this.store.currentOrder.order_id,
+                isManual: isManual,
+                hasCustomPaymentItems: !!customPaymentItems
+              });
+              _context39.next = 13;
+              return existingInFlight;
+            case 13:
+              return _context39.abrupt("return", _context39.sent);
+            case 14:
+              inFlightPromise = new Promise(function (resolve, reject) {
+                resolveInFlight = resolve;
+                rejectInFlight = reject;
+              });
+              this.syncOrderToBackendInFlightByOrderKey.set(orderLockKey, inFlightPromise);
+              _context39.prev = 16;
               this.logInfo('syncOrderToBackendWithReturn called', {
                 isManual: isManual
               });
@@ -3833,14 +3872,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 获取当前订单的支付项
               _context39.t0 = customPaymentItems;
               if (_context39.t0) {
-                _context39.next = 14;
+                _context39.next = 26;
                 break;
               }
-              _context39.next = 13;
+              _context39.next = 25;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
-            case 13:
+            case 25:
               _context39.t0 = _context39.sent;
-            case 14:
+            case 26:
               paymentItems = _context39.t0;
               // 处理支付项数据，确保包含完整的 metadata
               processedPaymentItems = paymentItems.map(function (item) {
@@ -3990,7 +4029,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context39.next = 30;
+              _context39.next = 42;
               return this.core.effects.emit("".concat(this.name, ":onOrderSubmitStart"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3998,9 +4037,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 30:
+            case 42:
               submitSuccess = false;
-              _context39.prev = 31;
+              _context39.prev = 43;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -4008,24 +4047,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context39.next = 35;
+              _context39.next = 47;
               return this.order.createOrderByCheckout(orderParams);
-            case 35:
+            case 47:
               checkoutResponse = _context39.sent;
               submitSuccess = true;
               this.store.currentOrder.payment_status = checkoutResponse.data.payment_status;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context39.next = 49;
+              _context39.next = 61;
               break;
-            case 41:
-              _context39.prev = 41;
-              _context39.t1 = _context39["catch"](31);
+            case 53:
+              _context39.prev = 53;
+              _context39.t1 = _context39["catch"](43);
               submitSuccess = false;
               submitError = _context39.t1 instanceof Error ? _context39.t1.message : String(_context39.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context39.next = 48;
+              _context39.next = 60;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -4035,11 +4074,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 48:
+            case 60:
               throw _context39.t1;
-            case 49:
-              _context39.prev = 49;
-              _context39.next = 52;
+            case 61:
+              _context39.prev = 61;
+              _context39.next = 64;
               return this.core.effects.emit("".concat(this.name, ":onOrderSubmitEnd"), {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -4050,18 +4089,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 52:
-              return _context39.finish(49);
-            case 53:
+            case 64:
+              return _context39.finish(61);
+            case 65:
               // 检查响应状态是否为成功状态
               responseStatus = (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status;
               isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code) === 200;
               if (isSuccessResponse) {
-                _context39.next = 60;
+                _context39.next = 72;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context39.next = 59;
+              _context39.next = 71;
               return this.core.effects.emit("".concat(this.name, ":onOrderSyncFailed"), {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -4072,18 +4111,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 59:
+            case 71:
               throw new Error(errorMessage);
-            case 60:
+            case 72:
               if (!isUpdateOperation) {
-                _context39.next = 64;
+                _context39.next = 76;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context39.next = 97;
+              _context39.next = 109;
               break;
-            case 64:
+            case 76:
               // 创建操作：从响应中提取新的订单ID
               extractedOrderId = (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 || (_checkoutResponse6 = _checkoutResponse6.data) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
@@ -4105,12 +4144,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context39.prev = 70;
+              _context39.prev = 82;
               latestPaymentStatus = this.store.currentOrder.payment_status;
               previousOrder = this.store.currentOrder;
-              _context39.next = 75;
+              _context39.next = 87;
               return this.payment.replaceOrderIdByUuidAsync(previousOrder.uuid, realOrderId);
-            case 75:
+            case 87:
               updatedOrder = _context39.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -4118,7 +4157,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 expectedOrderId: realOrderId
               });
               if (!updatedOrder) {
-                _context39.next = 86;
+                _context39.next = 98;
                 break;
               }
               this.logInfo('Payment模块返回的更新后订单:', {
@@ -4134,18 +4173,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 同步更新 Payment 模块 DB，避免后续读取 DB 时又拿回旧状态
               if (!latestPaymentStatus) {
-                _context39.next = 83;
+                _context39.next = 95;
                 break;
               }
-              _context39.next = 83;
+              _context39.next = 95;
               return this.payment.updateOrderAsync(previousOrder.uuid, {
                 payment_status: latestPaymentStatus
               });
-            case 83:
+            case 95:
               this.logInfo('[Checkout] 订单ID替换成功，当前订单ID:', this.store.currentOrder.order_id);
-              _context39.next = 90;
+              _context39.next = 102;
               break;
-            case 86:
+            case 98:
               this.logError('[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换');
 
               // 如果替换失败，手动更新订单ID
@@ -4156,62 +4195,62 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 afterReplacement: this.store.currentOrder.order_id,
                 目标ID: realOrderId
               });
-            case 90:
-              _context39.next = 97;
+            case 102:
+              _context39.next = 109;
               break;
-            case 92:
-              _context39.prev = 92;
-              _context39.t2 = _context39["catch"](70);
+            case 104:
+              _context39.prev = 104;
+              _context39.t2 = _context39["catch"](82);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context39.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 97:
-              _context39.prev = 97;
+            case 109:
+              _context39.prev = 109;
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context39.prev = 100;
+              _context39.prev = 112;
               _iterator3.s();
-            case 102:
+            case 114:
               if ((_step3 = _iterator3.n()).done) {
-                _context39.next = 108;
+                _context39.next = 120;
                 break;
               }
               paymentUuid = _step3.value;
-              _context39.next = 106;
+              _context39.next = 118;
               return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
-            case 106:
-              _context39.next = 102;
+            case 118:
+              _context39.next = 114;
               break;
-            case 108:
-              _context39.next = 113;
+            case 120:
+              _context39.next = 125;
               break;
-            case 110:
-              _context39.prev = 110;
-              _context39.t3 = _context39["catch"](100);
+            case 122:
+              _context39.prev = 122;
+              _context39.t3 = _context39["catch"](112);
               _iterator3.e(_context39.t3);
-            case 113:
-              _context39.prev = 113;
+            case 125:
+              _context39.prev = 125;
               _iterator3.f();
-              return _context39.finish(113);
-            case 116:
-              _context39.next = 121;
+              return _context39.finish(125);
+            case 128:
+              _context39.next = 133;
               break;
-            case 118:
-              _context39.prev = 118;
-              _context39.t4 = _context39["catch"](97);
+            case 130:
+              _context39.prev = 130;
+              _context39.t4 = _context39["catch"](109);
               this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
                 error: _context39.t4
               });
-            case 121:
+            case 133:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
@@ -4219,7 +4258,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.clearCalculationCache();
 
               // 触发订单同步完成事件
-              _context39.next = 125;
+              _context39.next = 137;
               return this.core.effects.emit("".concat(this.name, ":onOrderSynced"), {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -4228,18 +4267,33 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 125:
-              return _context39.abrupt("return", {
+            case 137:
+              // 返回同步结果
+              result = {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
-              });
-            case 126:
+              };
+              resolveInFlight(result);
+              return _context39.abrupt("return", result);
+            case 142:
+              _context39.prev = 142;
+              _context39.t5 = _context39["catch"](16);
+              rejectInFlight(_context39.t5);
+              throw _context39.t5;
+            case 146:
+              _context39.prev = 146;
+              currentInFlight = this.syncOrderToBackendInFlightByOrderKey.get(orderLockKey);
+              if (currentInFlight === inFlightPromise) {
+                this.syncOrderToBackendInFlightByOrderKey.delete(orderLockKey);
+              }
+              return _context39.finish(146);
+            case 150:
             case "end":
               return _context39.stop();
           }
-        }, _callee39, this, [[31, 41, 49, 53], [70, 92], [97, 118], [100, 110, 113, 116]]);
+        }, _callee39, this, [[16, 142, 146, 150], [43, 53, 61, 65], [82, 104], [109, 130], [112, 122, 125, 128]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/lib/modules/Summary/utils.d.ts

@@ -21,7 +21,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * @title: 计算定金
  * @param items - 购物车商品数组

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

@@ -343,7 +343,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

@@ -20,6 +20,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
     private otherParams;
     private logger;
     private calculationCache;
+    private syncOrderToBackendInFlightByOrderKey;
     order: OrderModule;
     payment: PaymentModule;
     constructor(name?: string, version?: string);

package/lib/solution/Checkout/index.js

@@ -52,6 +52,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     // LoggerManager 实例
     // 计算缓存（用于性能优化）
     this.calculationCache = {};
+    // 同步订单到后端锁（按订单维度），防止短时间内重复触发导致同一订单多次同步
+    this.syncOrderToBackendInFlightByOrderKey = /* @__PURE__ */ new Map();
   }
   async initialize(core, options) {
     this.core = core;
@@ -2373,305 +2375,342 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
-    this.logInfo("syncOrderToBackendWithReturn called", { isManual });
-    const currentOrderId = this.store.currentOrder.order_id;
-    const isUpdateOperation = this.store.isOrderSynced || !(0, import_utils.isVirtualOrderId)(currentOrderId);
-    this.logInfo(`开始同步订单到后端...`, {
-      currentOrderId,
-      isVirtualId: (0, import_utils.isVirtualOrderId)(currentOrderId || ""),
-      orderUuid: this.store.currentOrder.uuid,
-      isOrderSynced: this.store.isOrderSynced,
-      isManual
-    });
-    const paymentItems = customPaymentItems || await this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
-    const processedPaymentItems = paymentItems.map((item) => {
-      var _a2, _b2;
-      return {
-        ...item,
-        metadata: {
-          ...item.metadata,
-          rounding_rule: ((_a2 = item.metadata) == null ? void 0 : _a2.rounding_rule) || this.otherParams.order_rounding_setting,
-          shop_wallet_pass_id: ((_b2 = item.metadata) == null ? void 0 : _b2.shop_wallet_pass_id) || this.otherParams.shop_wallet_pass_id
-        }
-      };
-    });
-    let finalDepositAmount;
-    const manualDepositAmount = ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00";
-    const manualDepositValue = new import_decimal.default(manualDepositAmount);
-    if (manualDepositValue.gt(0)) {
-      finalDepositAmount = manualDepositAmount;
-      this.logInfo("使用手动设置的定金金额", {
-        manualDepositAmount,
-        reason: "用户通过setDepositAmountAsync手动设置了定金金额"
-      });
-    } else {
-      finalDepositAmount = "0.00";
-      this.logInfo("定金金额为0", {
-        manualDepositAmount,
-        reason: "手动设置和计算值均为0"
-      });
+    const orderLockKey = this.store.currentOrder.uuid || this.store.currentOrder.order_id;
+    if (!orderLockKey) {
+      throw new Error("缺少订单标识，无法同步到后端");
     }
-    if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.every((item) => item.order_payment_type !== "deposit")) {
-      finalDepositAmount = "0.00";
-      this.store.currentOrder.is_deposit = 0;
-    }
-    if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.some((item) => item.order_payment_type === "deposit")) {
-      finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
-        const amt = new import_decimal.default(item.amount || "0");
-        const rounding = new import_decimal.default(item.rounding_amount || "0");
-        return sum.plus(amt).sub(rounding);
-      }, new import_decimal.default(0)).toFixed(2);
-    }
-    if (this.store.currentOrder.is_deposit === 1 && new import_decimal.default(finalDepositAmount).gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
-      finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
-        const amt = new import_decimal.default(item.amount || "0");
-        const rounding = new import_decimal.default(item.rounding_amount || "0");
-        return sum.plus(amt).sub(rounding);
-      }, new import_decimal.default(0)).toFixed(2);
+    const existingInFlight = this.syncOrderToBackendInFlightByOrderKey.get(orderLockKey);
+    if (existingInFlight) {
+      this.logInfo(
+        "syncOrderToBackendWithReturn 触发锁：当前订单正在同步中，将等待当前同步结束",
+        {
+          orderLockKey,
+          orderUuid: this.store.currentOrder.uuid,
+          orderId: this.store.currentOrder.order_id,
+          isManual,
+          hasCustomPaymentItems: !!customPaymentItems
+        }
+      );
+      return await existingInFlight;
     }
-    this.logInfo("定金金额确定结果", {
-      depositPaymentItemsCount: processedPaymentItems.length,
-      depositPaymentItems: processedPaymentItems.map((item) => ({
-        uuid: item.uuid,
-        code: item.code,
-        amount: item.amount,
-        rounding_amount: item.rounding_amount,
-        order_payment_type: item.order_payment_type,
-        status: item.status
-      })),
-      manualDepositAmount,
-      finalDepositAmount,
-      isDeposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0
+    let resolveInFlight;
+    let rejectInFlight;
+    const inFlightPromise = new Promise((resolve, reject) => {
+      resolveInFlight = resolve;
+      rejectInFlight = reject;
     });
-    let orderPaymentStatus = paymentStatus;
-    if (!orderPaymentStatus) {
-      const totalPaidAmount = processedPaymentItems.filter((item) => item.status !== "voided").reduce((sum, item) => {
-        const amt = new import_decimal.default(item.amount || "0");
-        const rounding = new import_decimal.default(item.rounding_amount || "0");
-        return sum.plus(amt).sub(rounding);
-      }, new import_decimal.default(0));
-      if (totalPaidAmount.gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
-        orderPaymentStatus = "paid";
-      } else if (totalPaidAmount.gt(0)) {
-        orderPaymentStatus = "partially_paid";
-      } else {
-        orderPaymentStatus = "unpaid";
-      }
-    }
-    const orderParams = {
-      ...this.store.localOrderData,
-      payment_status: orderPaymentStatus,
-      type: this.store.localOrderData.type,
-      platform: this.store.localOrderData.platform,
-      payments: processedPaymentItems,
-      // 使用处理过的支付项数据
-      customer_id: (_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id,
-      // 添加客户ID
-      is_price_include_tax: this.otherParams.is_price_include_tax,
-      // core 有
-      tax_title: this.otherParams.tax_title,
-      // core 没有
-      tax_rate: this.otherParams.tax_rate,
-      // core 有
-      tax_country_code: this.otherParams.tax_country_code,
-      // core 没有
-      currency_code: this.otherParams.currency_code,
-      currency_symbol: this.otherParams.currency_symbol,
-      currency_format: this.otherParams.currency_format,
-      is_deposit: (((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
-      deposit_amount: finalDepositAmount,
-      // 使用最终确定的定金金额（手动设置优先）
-      product_tax_fee: this.store.localOrderData.tax_fee,
-      note: this.store.localOrderData.shop_note,
-      bookings: (_e = this.store.localOrderData.bookings) == null ? void 0 : _e.map((item) => {
+    this.syncOrderToBackendInFlightByOrderKey.set(orderLockKey, inFlightPromise);
+    try {
+      this.logInfo("syncOrderToBackendWithReturn called", { isManual });
+      const currentOrderId = this.store.currentOrder.order_id;
+      const isUpdateOperation = this.store.isOrderSynced || !(0, import_utils.isVirtualOrderId)(currentOrderId);
+      this.logInfo(`开始同步订单到后端...`, {
+        currentOrderId,
+        isVirtualId: (0, import_utils.isVirtualOrderId)(currentOrderId || ""),
+        orderUuid: this.store.currentOrder.uuid,
+        isOrderSynced: this.store.isOrderSynced,
+        isManual
+      });
+      const paymentItems = customPaymentItems || await this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
+      const processedPaymentItems = paymentItems.map((item) => {
+        var _a2, _b2;
         return {
           ...item,
-          product: {
-            ...item.product,
-            custom_deposit_data: void 0
-          },
-          deposit: void 0
+          metadata: {
+            ...item.metadata,
+            rounding_rule: ((_a2 = item.metadata) == null ? void 0 : _a2.rounding_rule) || this.otherParams.order_rounding_setting,
+            shop_wallet_pass_id: ((_b2 = item.metadata) == null ? void 0 : _b2.shop_wallet_pass_id) || this.otherParams.shop_wallet_pass_id
+          }
         };
-      }),
-      relation_products: (_f = this.store.localOrderData.relation_products) == null ? void 0 : _f.map(
-        (item) => {
+      });
+      let finalDepositAmount;
+      const manualDepositAmount = ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00";
+      const manualDepositValue = new import_decimal.default(manualDepositAmount);
+      if (manualDepositValue.gt(0)) {
+        finalDepositAmount = manualDepositAmount;
+        this.logInfo("使用手动设置的定金金额", {
+          manualDepositAmount,
+          reason: "用户通过setDepositAmountAsync手动设置了定金金额"
+        });
+      } else {
+        finalDepositAmount = "0.00";
+        this.logInfo("定金金额为0", {
+          manualDepositAmount,
+          reason: "手动设置和计算值均为0"
+        });
+      }
+      if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.every((item) => item.order_payment_type !== "deposit")) {
+        finalDepositAmount = "0.00";
+        this.store.currentOrder.is_deposit = 0;
+      }
+      if (this.store.currentOrder.is_deposit === 0 && processedPaymentItems.some((item) => item.order_payment_type === "deposit")) {
+        finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
+          const amt = new import_decimal.default(item.amount || "0");
+          const rounding = new import_decimal.default(item.rounding_amount || "0");
+          return sum.plus(amt).sub(rounding);
+        }, new import_decimal.default(0)).toFixed(2);
+      }
+      if (this.store.currentOrder.is_deposit === 1 && new import_decimal.default(finalDepositAmount).gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
+        finalDepositAmount = processedPaymentItems.filter((item) => item.status !== "voided" && item.order_payment_type === "deposit").reduce((sum, item) => {
+          const amt = new import_decimal.default(item.amount || "0");
+          const rounding = new import_decimal.default(item.rounding_amount || "0");
+          return sum.plus(amt).sub(rounding);
+        }, new import_decimal.default(0)).toFixed(2);
+      }
+      this.logInfo("定金金额确定结果", {
+        depositPaymentItemsCount: processedPaymentItems.length,
+        depositPaymentItems: processedPaymentItems.map((item) => ({
+          uuid: item.uuid,
+          code: item.code,
+          amount: item.amount,
+          rounding_amount: item.rounding_amount,
+          order_payment_type: item.order_payment_type,
+          status: item.status
+        })),
+        manualDepositAmount,
+        finalDepositAmount,
+        isDeposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0
+      });
+      let orderPaymentStatus = paymentStatus;
+      if (!orderPaymentStatus) {
+        const totalPaidAmount = processedPaymentItems.filter((item) => item.status !== "voided").reduce((sum, item) => {
+          const amt = new import_decimal.default(item.amount || "0");
+          const rounding = new import_decimal.default(item.rounding_amount || "0");
+          return sum.plus(amt).sub(rounding);
+        }, new import_decimal.default(0));
+        if (totalPaidAmount.gte(new import_decimal.default(this.store.currentOrder.total_amount))) {
+          orderPaymentStatus = "paid";
+        } else if (totalPaidAmount.gt(0)) {
+          orderPaymentStatus = "partially_paid";
+        } else {
+          orderPaymentStatus = "unpaid";
+        }
+      }
+      const orderParams = {
+        ...this.store.localOrderData,
+        payment_status: orderPaymentStatus,
+        type: this.store.localOrderData.type,
+        platform: this.store.localOrderData.platform,
+        payments: processedPaymentItems,
+        // 使用处理过的支付项数据
+        customer_id: (_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id,
+        // 添加客户ID
+        is_price_include_tax: this.otherParams.is_price_include_tax,
+        // core 有
+        tax_title: this.otherParams.tax_title,
+        // core 没有
+        tax_rate: this.otherParams.tax_rate,
+        // core 有
+        tax_country_code: this.otherParams.tax_country_code,
+        // core 没有
+        currency_code: this.otherParams.currency_code,
+        currency_symbol: this.otherParams.currency_symbol,
+        currency_format: this.otherParams.currency_format,
+        is_deposit: (((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
+        deposit_amount: finalDepositAmount,
+        // 使用最终确定的定金金额（手动设置优先）
+        product_tax_fee: this.store.localOrderData.tax_fee,
+        note: this.store.localOrderData.shop_note,
+        bookings: (_e = this.store.localOrderData.bookings) == null ? void 0 : _e.map((item) => {
           return {
             ...item,
-            custom_deposit_data: void 0,
+            product: {
+              ...item.product,
+              custom_deposit_data: void 0
+            },
             deposit: void 0
           };
+        }),
+        relation_products: (_f = this.store.localOrderData.relation_products) == null ? void 0 : _f.map(
+          (item) => {
+            return {
+              ...item,
+              custom_deposit_data: void 0,
+              deposit: void 0
+            };
+          }
+        )
+      };
+      if (isUpdateOperation) {
+        if ((0, import_utils.isVirtualOrderId)(currentOrderId)) {
+          this.logWarning(
+            "尝试数据修复：暂时不包含order_id，注意：这次调用将作为创建操作处理，但后续会修复数据一致性"
+          );
+        } else {
+          orderParams.order_id = currentOrderId;
         }
-      )
-    };
-    if (isUpdateOperation) {
-      if ((0, import_utils.isVirtualOrderId)(currentOrderId)) {
-        this.logWarning(
-          "尝试数据修复：暂时不包含order_id，注意：这次调用将作为创建操作处理，但后续会修复数据一致性"
-        );
-      } else {
-        orderParams.order_id = currentOrderId;
       }
-    }
-    const startTime = Date.now();
-    await this.core.effects.emit(`${this.name}:onOrderSubmitStart`, {
-      orderUuid: this.store.currentOrder.uuid,
-      operation: isUpdateOperation ? "update" : "create",
-      isManual,
-      paymentItemCount: paymentItems.length,
-      timestamp: startTime
-    });
-    let checkoutResponse;
-    let submitSuccess = false;
-    let submitError;
-    try {
-      this.logInfo("Calling backend checkout API", {
-        url: "/order/checkout",
-        isManual,
-        ...orderParams
-      });
-      checkoutResponse = await this.order.createOrderByCheckout(orderParams);
-      submitSuccess = true;
-      this.store.currentOrder.payment_status = checkoutResponse.data.payment_status;
-      this.logInfo("下单接口调用成功", checkoutResponse);
-    } catch (error) {
-      submitSuccess = false;
-      submitError = error instanceof Error ? error.message : String(error);
-      this.logError("下单接口调用失败:", submitError);
-      await this.core.effects.emit(`${this.name}:onOrderSyncFailed`, {
-        orderUuid: this.store.currentOrder.uuid,
-        operation: isUpdateOperation ? "update" : "create",
-        isManual,
-        error: submitError,
-        errorType: "network_error",
-        duration: Date.now() - startTime,
-        timestamp: Date.now()
-      });
-      throw error;
-    } finally {
-      await this.core.effects.emit(`${this.name}:onOrderSubmitEnd`, {
-        success: submitSuccess,
+      const startTime = Date.now();
+      await this.core.effects.emit(`${this.name}:onOrderSubmitStart`, {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
-        orderId: submitSuccess ? ((_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
-        error: submitError,
-        duration: Date.now() - startTime,
-        timestamp: Date.now()
+        paymentItemCount: paymentItems.length,
+        timestamp: startTime
       });
-    }
-    const responseStatus = checkoutResponse == null ? void 0 : checkoutResponse.status;
-    const isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === "success" || responseStatus === 1 && (checkoutResponse == null ? void 0 : checkoutResponse.code) === 200;
-    if (!isSuccessResponse) {
-      const errorMessage = (checkoutResponse == null ? void 0 : checkoutResponse.message) || "订单同步失败，后端返回非成功状态";
-      await this.core.effects.emit(`${this.name}:onOrderSyncFailed`, {
-        orderUuid: this.store.currentOrder.uuid,
-        operation: isUpdateOperation ? "update" : "create",
-        isManual,
-        error: errorMessage,
-        errorType: "api_error",
-        response: checkoutResponse,
-        duration: Date.now() - startTime,
-        timestamp: Date.now()
-      });
-      throw new Error(errorMessage);
-    }
-    let realOrderId;
-    if (isUpdateOperation) {
-      realOrderId = currentOrderId;
-    } else {
-      let extractedOrderId = (_h = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _h.order_id;
-      if (!extractedOrderId) {
-        extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
-      }
-      if (extractedOrderId !== void 0 && extractedOrderId !== null) {
-        extractedOrderId = String(extractedOrderId);
+      let checkoutResponse;
+      let submitSuccess = false;
+      let submitError;
+      try {
+        this.logInfo("Calling backend checkout API", {
+          url: "/order/checkout",
+          isManual,
+          ...orderParams
+        });
+        checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+        submitSuccess = true;
+        this.store.currentOrder.payment_status = checkoutResponse.data.payment_status;
+        this.logInfo("下单接口调用成功", checkoutResponse);
+      } catch (error) {
+        submitSuccess = false;
+        submitError = error instanceof Error ? error.message : String(error);
+        this.logError("下单接口调用失败:", submitError);
+        await this.core.effects.emit(`${this.name}:onOrderSyncFailed`, {
+          orderUuid: this.store.currentOrder.uuid,
+          operation: isUpdateOperation ? "update" : "create",
+          isManual,
+          error: submitError,
+          errorType: "network_error",
+          duration: Date.now() - startTime,
+          timestamp: Date.now()
+        });
+        throw error;
+      } finally {
+        await this.core.effects.emit(`${this.name}:onOrderSubmitEnd`, {
+          success: submitSuccess,
+          orderUuid: this.store.currentOrder.uuid,
+          operation: isUpdateOperation ? "update" : "create",
+          isManual,
+          orderId: submitSuccess ? ((_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+          error: submitError,
+          duration: Date.now() - startTime,
+          timestamp: Date.now()
+        });
       }
-      if (!extractedOrderId) {
-        this.logError("后端返回的订单信息中未包含订单ID");
+      const responseStatus = checkoutResponse == null ? void 0 : checkoutResponse.status;
+      const isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === "success" || responseStatus === 1 && (checkoutResponse == null ? void 0 : checkoutResponse.code) === 200;
+      if (!isSuccessResponse) {
+        const errorMessage = (checkoutResponse == null ? void 0 : checkoutResponse.message) || "订单同步失败，后端返回非成功状态";
+        await this.core.effects.emit(`${this.name}:onOrderSyncFailed`, {
+          orderUuid: this.store.currentOrder.uuid,
+          operation: isUpdateOperation ? "update" : "create",
+          isManual,
+          error: errorMessage,
+          errorType: "api_error",
+          response: checkoutResponse,
+          duration: Date.now() - startTime,
+          timestamp: Date.now()
+        });
+        throw new Error(errorMessage);
       }
-      realOrderId = extractedOrderId;
-      this.logInfo("准备替换订单ID:", {
-        orderUuid: this.store.currentOrder.uuid,
-        oldOrderId: this.store.currentOrder.order_id,
-        newOrderId: realOrderId
-      });
-      try {
-        const latestPaymentStatus = this.store.currentOrder.payment_status;
-        const previousOrder = this.store.currentOrder;
-        const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-          previousOrder.uuid,
-          realOrderId
-        );
-        this.logInfo("Payment模块替换订单ID结果:", {
-          wasSuccessful: !!updatedOrder,
-          returnedOrderId: updatedOrder == null ? void 0 : updatedOrder.order_id,
-          expectedOrderId: realOrderId
+      let realOrderId;
+      if (isUpdateOperation) {
+        realOrderId = currentOrderId;
+      } else {
+        let extractedOrderId = (_h = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _h.order_id;
+        if (!extractedOrderId) {
+          extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
+        }
+        if (extractedOrderId !== void 0 && extractedOrderId !== null) {
+          extractedOrderId = String(extractedOrderId);
+        }
+        if (!extractedOrderId) {
+          this.logError("后端返回的订单信息中未包含订单ID");
+        }
+        realOrderId = extractedOrderId;
+        this.logInfo("准备替换订单ID:", {
+          orderUuid: this.store.currentOrder.uuid,
+          oldOrderId: this.store.currentOrder.order_id,
+          newOrderId: realOrderId
         });
-        if (updatedOrder) {
-          this.logInfo("Payment模块返回的更新后订单:", {
-            uuid: updatedOrder.uuid,
-            orderId: updatedOrder.order_id,
-            totalAmount: updatedOrder.total_amount
+        try {
+          const latestPaymentStatus = this.store.currentOrder.payment_status;
+          const previousOrder = this.store.currentOrder;
+          const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
+            previousOrder.uuid,
+            realOrderId
+          );
+          this.logInfo("Payment模块替换订单ID结果:", {
+            wasSuccessful: !!updatedOrder,
+            returnedOrderId: updatedOrder == null ? void 0 : updatedOrder.order_id,
+            expectedOrderId: realOrderId
           });
-          this.store.currentOrder = {
-            ...previousOrder,
-            ...updatedOrder,
-            payment_status: latestPaymentStatus
-          };
-          if (latestPaymentStatus)
-            await this.payment.updateOrderAsync(previousOrder.uuid, {
+          if (updatedOrder) {
+            this.logInfo("Payment模块返回的更新后订单:", {
+              uuid: updatedOrder.uuid,
+              orderId: updatedOrder.order_id,
+              totalAmount: updatedOrder.total_amount
+            });
+            this.store.currentOrder = {
+              ...previousOrder,
+              ...updatedOrder,
               payment_status: latestPaymentStatus
+            };
+            if (latestPaymentStatus)
+              await this.payment.updateOrderAsync(previousOrder.uuid, {
+                payment_status: latestPaymentStatus
+              });
+            this.logInfo(
+              "[Checkout] 订单ID替换成功，当前订单ID:",
+              this.store.currentOrder.order_id
+            );
+          } else {
+            this.logError(
+              "[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换"
+            );
+            const beforeManualUpdate = this.store.currentOrder.order_id;
+            this.store.currentOrder.order_id = realOrderId;
+            this.logInfo("手动设置订单ID:", {
+              beforeReplacement: beforeManualUpdate,
+              afterReplacement: this.store.currentOrder.order_id,
+              目标ID: realOrderId
             });
-          this.logInfo(
-            "[Checkout] 订单ID替换成功，当前订单ID:",
-            this.store.currentOrder.order_id
-          );
-        } else {
-          this.logError(
-            "[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换"
-          );
-          const beforeManualUpdate = this.store.currentOrder.order_id;
+          }
+        } catch (error) {
+          this.logError("调用Payment模块替换订单ID时发生错误:", error);
           this.store.currentOrder.order_id = realOrderId;
-          this.logInfo("手动设置订单ID:", {
-            beforeReplacement: beforeManualUpdate,
-            afterReplacement: this.store.currentOrder.order_id,
-            目标ID: realOrderId
-          });
+          this.logInfo("错误恢复：手动设置订单ID:", realOrderId);
         }
-      } catch (error) {
-        this.logError("调用Payment模块替换订单ID时发生错误:", error);
-        this.store.currentOrder.order_id = realOrderId;
-        this.logInfo("错误恢复：手动设置订单ID:", realOrderId);
       }
-    }
-    try {
-      const syncedPaymentUuids = processedPaymentItems.filter((item) => item.status !== "voided").map((item) => item.uuid).filter(Boolean);
-      for (const paymentUuid of syncedPaymentUuids) {
-        await this.payment.updatePaymentAsync(
-          this.store.currentOrder.uuid,
-          paymentUuid,
-          { isSynced: true, syncError: void 0 }
-        );
+      try {
+        const syncedPaymentUuids = processedPaymentItems.filter((item) => item.status !== "voided").map((item) => item.uuid).filter(Boolean);
+        for (const paymentUuid of syncedPaymentUuids) {
+          await this.payment.updatePaymentAsync(
+            this.store.currentOrder.uuid,
+            paymentUuid,
+            { isSynced: true, syncError: void 0 }
+          );
+        }
+      } catch (e) {
+        this.logWarning("标记支付项已同步失败（不阻塞主流程）", { error: e });
+      }
+      this.store.isOrderSynced = true;
+      this.clearCalculationCache();
+      await this.core.effects.emit(`${this.name}:onOrderSynced`, {
+        orderUuid: this.store.currentOrder.uuid,
+        realOrderId,
+        virtualOrderId: this.store.currentOrder.order_id,
+        timestamp: Date.now(),
+        isManual,
+        response: checkoutResponse
+      });
+      const result = {
+        success: true,
+        orderId: realOrderId,
+        orderUuid: this.store.currentOrder.uuid,
+        response: checkoutResponse
+      };
+      resolveInFlight(result);
+      return result;
+    } catch (error) {
+      rejectInFlight(error);
+      throw error;
+    } finally {
+      const currentInFlight = this.syncOrderToBackendInFlightByOrderKey.get(orderLockKey);
+      if (currentInFlight === inFlightPromise) {
+        this.syncOrderToBackendInFlightByOrderKey.delete(orderLockKey);
       }
-    } catch (e) {
-      this.logWarning("标记支付项已同步失败（不阻塞主流程）", { error: e });
     }
-    this.store.isOrderSynced = true;
-    this.clearCalculationCache();
-    await this.core.effects.emit(`${this.name}:onOrderSynced`, {
-      orderUuid: this.store.currentOrder.uuid,
-      realOrderId,
-      virtualOrderId: this.store.currentOrder.order_id,
-      timestamp: Date.now(),
-      isManual,
-      response: checkoutResponse
-    });
-    return {
-      success: true,
-      orderId: realOrderId,
-      orderUuid: this.store.currentOrder.uuid,
-      response: checkoutResponse
-    };
   }
   async setOtherParams(params, { cover = false } = {}) {
     if (cover) {

package/package.json

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