@pisell/pisellos 2.2.23 → 2.2.25

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;
@@ -859,12 +861,22 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.warn("[Checkout] 没有当前订单，无法替换订单ID");
         return null;
       }
+      const previousOrder = this.store.currentOrder;
+      const latestPaymentStatus = previousOrder.payment_status;
       const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-        this.store.currentOrder.uuid,
+        previousOrder.uuid,
         newOrderId
       );
       if (updatedOrder) {
-        this.store.currentOrder = updatedOrder;
+        this.store.currentOrder = {
+          ...previousOrder,
+          ...updatedOrder,
+          payment_status: latestPaymentStatus
+        };
+        if (latestPaymentStatus)
+          await this.payment.updateOrderAsync(previousOrder.uuid, {
+            payment_status: latestPaymentStatus
+          });
         await this.core.effects.emit(`${this.name}:onOrderCreated`, {
           order: updatedOrder,
           timestamp: Date.now()
@@ -1623,9 +1635,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const allPaymentItems = await this.payment.getPaymentItemsAsync(
         this.store.currentOrder.uuid
       );
+      const orderPaymentStatus = allPaymentItems.filter((item) => item.status !== "voided").length > 0 ? "partially_paid" : "payment_processing";
       const syncResult = await this.syncOrderToBackendWithReturn(
         true,
-        allPaymentItems
+        allPaymentItems,
+        orderPaymentStatus
       );
       this.logInfo("保存订单完成:", {
         orderUuid,
@@ -2356,283 +2370,347 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @param customPaymentItems 自定义支付项列表，如果提供则使用此列表而不是从数据库获取
    * @returns 包含订单ID、UUID和完整后端响应的对象
    */
-  async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
+  async syncOrderToBackendWithReturn(isManual = false, customPaymentItems, paymentStatus) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     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;
     });
-    const orderParams = {
-      ...this.store.localOrderData,
-      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.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`, {
+      const startTime = Date.now();
+      await this.core.effects.emit(`${this.name}:onOrderSubmitStart`, {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
-        error: submitError,
-        errorType: "network_error",
-        duration: Date.now() - startTime,
-        timestamp: Date.now()
+        paymentItemCount: paymentItems.length,
+        timestamp: startTime
       });
-      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()
-      });
-    }
-    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 updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-          this.store.currentOrder.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
-          });
-          this.store.currentOrder = updatedOrder;
-          this.logInfo(
-            "[Checkout] 订单ID替换成功，当前订单ID:",
-            this.store.currentOrder.order_id
-          );
-        } else {
-          this.logError(
-            "[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换"
+        try {
+          const latestPaymentStatus = this.store.currentOrder.payment_status;
+          const previousOrder = this.store.currentOrder;
+          const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
+            previousOrder.uuid,
+            realOrderId
           );
-          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("Payment模块替换订单ID结果:", {
+            wasSuccessful: !!updatedOrder,
+            returnedOrderId: updatedOrder == null ? void 0 : updatedOrder.order_id,
+            expectedOrderId: realOrderId
           });
+          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
+            });
+          }
+        } catch (error) {
+          this.logError("调用Payment模块替换订单ID时发生错误:", error);
+          this.store.currentOrder.order_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) {