@pisell/pisellos 2.1.24 → 2.1.26

package/dist/solution/Checkout/index.js

@@ -31,6 +31,7 @@ import { PaymentModule } from "../../modules/Payment";
 import { CheckoutHooks, CheckoutErrorType } from "./types";
 import { PaymentStatus, PaymentHooks } from "../../modules/Payment/types";
 import { validateCheckoutData, createCheckoutError, validateLocalOrderData, generateLocalOrderId, formatDateTime, extractAmountFromCartSummary, isVirtualOrderId, isCashPayment } from "./utils";
+import { getProductDeposit } from "../../modules/Cart/utils";
 export * from "./types";
 
 /**
@@ -398,8 +399,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4;
-        var amountInfo, walletBusinessData;
+        var _this$store$currentOr3, _this$store$currentCu, _this$store$currentOr4, _this$store$currentOr5, _this$store$currentOr7;
+        var amountInfo, walletBusinessData, _this$store$currentOr6;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -421,34 +422,39 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 customer_id: (_this$store$currentCu = this.store.currentCustomer) !== null && _this$store$currentCu !== void 0 && _this$store$currentCu.customer_id ? Number(this.store.currentCustomer.customer_id) : undefined,
                 amountInfo: {
                   totalAmount: amountInfo.totalAmount,
-                  subTotal: amountInfo.subTotal
+                  subTotal: amountInfo.subTotal,
+                  depositAmount: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.deposit_amount,
+                  isDeposit: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.is_deposit
                 },
                 products: this.getProductListByOrder()
-              }, params);
+              }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
+              if (this.store.isOrderSynced) {
+                walletBusinessData.payment_order_id = (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_id;
+              }
               this.logInfo('开始拉取:initializeWalletDataFromBusinessAsync', {
                 walletBusinessData: walletBusinessData
               });
-              _context8.next = 9;
+              _context8.next = 10;
               return this.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
-            case 9:
+            case 10:
               this.logInfo('调用结束:initializeWalletDataFromBusinessAsync', {
                 walletBusinessData: walletBusinessData
               });
 
               // 因为上面是接口 这里最好检查一下还有没有 currentOrder 了，如果没有，则不触发事件
               if (this.store.currentOrder) {
-                _context8.next = 12;
+                _context8.next = 13;
                 break;
               }
               return _context8.abrupt("return");
-            case 12:
+            case 13:
               this.logInfo('initWalletData currentOrder found', {
                 currentOrder: this.store.currentOrder
               });
               // 触发钱包数据初始化完成事件
-              _context8.next = 15;
+              _context8.next = 16;
               return this.core.effects.emit(CheckoutHooks.OnWalletDataInitialized, {
-                orderUuid: (_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.uuid,
+                orderUuid: (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.uuid,
                 customerId: walletBusinessData.customer_id,
                 walletBusinessData: {
                   customer_id: walletBusinessData.customer_id,
@@ -457,7 +463,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 },
                 timestamp: Date.now()
               });
-            case 15:
+            case 16:
             case "end":
               return _context8.stop();
           }
@@ -468,6 +474,59 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return initWalletData;
     }()
+  }, {
+    key: "checkIsNeedDepositAsync",
+    value: function checkIsNeedDepositAsync(bookings, relationProducts) {
+      var summaryDeposit = {
+        total: 0,
+        protocols: [],
+        hasDeposit: false
+      };
+      bookings === null || bookings === void 0 || bookings.forEach(function (item) {
+        var total = item.product.calculated_selling_price;
+        var deposit = getProductDeposit({
+          cartItem: {
+            total: total
+          },
+          product: item.product,
+          bundle: item.bundle,
+          options: item.options,
+          num: item.num
+        });
+        item.deposit = deposit;
+        if (deposit !== null && deposit !== void 0 && deposit.total && Number(deposit.total) > 0) {
+          summaryDeposit.protocols = summaryDeposit.protocols.concat(deposit.protocols);
+          summaryDeposit.total = new Decimal(summaryDeposit.total).plus(deposit.total).toNumber();
+          summaryDeposit.hasDeposit = true;
+        }
+      });
+      relationProducts === null || relationProducts === void 0 || relationProducts.forEach(function (item) {
+        var deposit = getProductDeposit({
+          cartItem: {
+            total: item.price * item.num
+          },
+          product: item,
+          bundle: item.product_bundle,
+          options: item.product_option_item,
+          num: item.num
+        });
+        item.deposit = deposit;
+        if (deposit !== null && deposit !== void 0 && deposit.total && Number(deposit.total) > 0) {
+          // 需要减去商品券折扣卡抵扣的金额
+          summaryDeposit.total = new Decimal(summaryDeposit.total).plus(deposit.total).toNumber();
+          item.discount_list.forEach(function (discount) {
+            summaryDeposit.total = new Decimal(summaryDeposit.total).minus(discount.amount || 0).toNumber();
+          });
+          summaryDeposit.protocols = summaryDeposit.protocols.concat(deposit.protocols);
+          summaryDeposit.hasDeposit = true;
+        }
+      });
+
+      // 将总金额四舍五入到两位小数
+      summaryDeposit.total = new Decimal(summaryDeposit.total).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toNumber();
+      return summaryDeposit;
+    }
+
     /**
      * 创建本地订单 (前端模拟下单流程)
      *
@@ -480,7 +539,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _createLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
         var _params$orderData, _params$orderData2, _params$orderData3, _params$orderData4, _params$orderData5, _params$cartSummary;
-        var _params$totalInfo, _params$totalInfo2, _params$totalInfo3, _params$totalInfo4, validation, localOrderId, amountInfo, customerInfo, paymentOrder;
+        var _params$totalInfo, _params$totalInfo2, _params$totalInfo3, _params$totalInfo4, validation, localOrderId, amountInfo, customerInfo, isNeedDeposit, paymentOrder;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -537,13 +596,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 console.log('[Checkout] 未提供客户信息');
               }
 
-              // 创建支付订单对象
-              _context9.next = 21;
+              // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
+              isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 创建支付订单对象
+              _context9.next = 22;
               return this.payment.createPaymentOrderAsync({
                 order_id: localOrderId,
                 total_amount: amountInfo.totalAmount,
-                is_deposit: params.orderData.is_deposit || 0,
-                deposit_amount: amountInfo.depositAmount || '0.00',
+                is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+                deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : '0.00',
                 order_info: {
                   original_order_data: params.orderData,
                   cart_summary: params.cartSummary,
@@ -555,7 +615,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   amount_breakdown: amountInfo
                 }
               });
-            case 21:
+            case 22:
               paymentOrder = _context9.sent;
               this.store.currentOrder = paymentOrder;
 
@@ -569,9 +629,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 自动设置 stateAmount 为剩余未支付金额
-              _context9.next = 27;
-              return this.updateStateAmountToRemaining();
-            case 27:
+              _context9.next = 28;
+              return this.updateStateAmountToRemaining(false);
+            case 28:
               this.logInfo('本地订单创建成功:', {
                 localOrderId: localOrderId,
                 uuid: paymentOrder.uuid,
@@ -582,29 +642,203 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
               this.initWalletData();
               return _context9.abrupt("return", paymentOrder);
-            case 32:
-              _context9.prev = 32;
+            case 33:
+              _context9.prev = 33;
               _context9.t0 = _context9["catch"](1);
-              _context9.next = 36;
+              _context9.next = 37;
               return this.handleError(_context9.t0, CheckoutErrorType.OrderCreationFailed);
-            case 36:
+            case 37:
               this.logError('本地订单创建失败:', _context9.t0);
               this.core.effects.emit(CheckoutHooks.OnOrderCreationFailed, {
                 error: this.store.lastError,
                 timestamp: Date.now()
               });
               throw _context9.t0;
-            case 39:
+            case 40:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[1, 32]]);
+        }, _callee9, this, [[1, 33]]);
       }));
       function createLocalOrderAsync(_x11) {
         return _createLocalOrderAsync.apply(this, arguments);
       }
       return createLocalOrderAsync;
     }()
+    /**
+     * 更新本地订单（已同步后端的订单）并设置为当前订单
+     *
+     * 通过传入真实的 orderId，对已缓存的订单数据进行更新，
+     * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
+     */
+    )
+  }, {
+    key: "updateLocalOrderAsync",
+    value: (function () {
+      var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+        var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
+        var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit, updated, syncedAmount, remainingExpectAmount, isNeedDeposit, created;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              this.logInfo('updateLocalOrderAsync called', {
+                orderId: params.orderId,
+                orderDataType: (_params$orderData6 = params.orderData) === null || _params$orderData6 === void 0 ? void 0 : _params$orderData6.type,
+                bookingsCount: ((_params$orderData7 = params.orderData) === null || _params$orderData7 === void 0 || (_params$orderData7 = _params$orderData7.bookings) === null || _params$orderData7 === void 0 ? void 0 : _params$orderData7.length) || 0,
+                cartSummaryCount: ((_params$cartSummary2 = params.cartSummary) === null || _params$cartSummary2 === void 0 ? void 0 : _params$cartSummary2.length) || 0,
+                totalInfoKeys: params.totalInfo ? Object.keys(params.totalInfo) : []
+              });
+
+              // 基础校验
+              validation = validateLocalOrderData(params.orderData);
+              if (validation.valid) {
+                _context10.next = 4;
+                break;
+              }
+              throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u8BA2\u5355\u6570\u636E\u9A8C\u8BC1\u5931\u8D25: ".concat(validation.errors.join(', ')));
+            case 4:
+              // 计算金额
+              amountInfo = extractAmountFromCartSummary(params.cartSummary); // 规范化补充字段
+              params.orderData.created_at = formatDateTime(new Date());
+              params.orderData.platform = 'pos';
+              params.orderData.surcharge_fee = (_params$totalInfo5 = params.totalInfo) === null || _params$totalInfo5 === void 0 || (_params$totalInfo5 = _params$totalInfo5.total) === null || _params$totalInfo5 === void 0 ? void 0 : _params$totalInfo5.otherAmount;
+              params.orderData.surcharges = (_params$totalInfo6 = params.totalInfo) === null || _params$totalInfo6 === void 0 || (_params$totalInfo6 = _params$totalInfo6.total) === null || _params$totalInfo6 === void 0 ? void 0 : _params$totalInfo6.surcharge;
+              params.orderData.shop_discount = (_params$totalInfo7 = params.totalInfo) === null || _params$totalInfo7 === void 0 || (_params$totalInfo7 = _params$totalInfo7.total) === null || _params$totalInfo7 === void 0 ? void 0 : _params$totalInfo7.shopDiscount;
+              params.orderData.tax_fee = (_params$totalInfo8 = params.totalInfo) === null || _params$totalInfo8 === void 0 || (_params$totalInfo8 = _params$totalInfo8.total) === null || _params$totalInfo8 === void 0 ? void 0 : _params$totalInfo8.tax;
+
+              // 持久化原始数据
+              this.store.localOrderData = params.orderData;
+              this.store.cartSummary = params.cartSummary;
+
+              // 同步客户信息
+              customerInfo = {
+                customer_id: params.orderData.customer_id,
+                customer_name: params.orderData.customer_name
+              };
+              if (customerInfo.customer_id || customerInfo.customer_name) {
+                this.store.currentCustomer = customerInfo;
+              } else {
+                this.store.currentCustomer = undefined;
+              }
+
+              // 保留原有支付项：通过 orderId 找到现有订单（按 id 或 order_id 匹配）
+              _context10.next = 17;
+              return this.payment.getOrderListAsync();
+            case 17:
+              allOrders = _context10.sent;
+              existingOrder = allOrders.find(function (o) {
+                return String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId);
+              });
+              if (!existingOrder) {
+                _context10.next = 42;
+                break;
+              }
+              // 基于现有支付项计算新的 expect_amount
+              totalAmount = new Decimal(amountInfo.totalAmount || '0');
+              activePayments = (existingOrder.payment || []).filter(function (p) {
+                return p.status !== 'voided';
+              });
+              paidAmount = activePayments.reduce(function (sum, p) {
+                var amt = new Decimal(p.amount || '0');
+                var rounding = new Decimal(p.rounding_amount || '0').abs();
+                return sum.plus(amt).plus(rounding);
+              }, new Decimal(0));
+              remaining = Decimal.max(0, totalAmount.minus(paidAmount)).toFixed(2); // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
+              _isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 更新到支付模块（使用 uuid，不修改 payment 列表）
+              _context10.next = 27;
+              return this.payment.updateOrderAsync(existingOrder.uuid, {
+                total_amount: amountInfo.totalAmount,
+                is_deposit: _isNeedDeposit.hasDeposit ? 1 : 0,
+                deposit_amount: _isNeedDeposit.total ? _isNeedDeposit.total.toString() : '0.00',
+                expect_amount: remaining,
+                order_info: {
+                  original_order_data: params.orderData,
+                  cart_summary: params.cartSummary,
+                  created_at: new Date().toISOString(),
+                  platform: params.orderData.platform,
+                  type: params.orderData.type,
+                  schedule_date: params.orderData.schedule_date,
+                  shop_note: params.orderData.shop_note,
+                  amount_breakdown: amountInfo
+                }
+              });
+            case 27:
+              _context10.next = 29;
+              return this.payment.getPaymentOrderByUuidAsync(existingOrder.uuid);
+            case 29:
+              updated = _context10.sent;
+              if (updated) {
+                _context10.next = 32;
+                break;
+              }
+              throw createCheckoutError(CheckoutErrorType.UnknownError, '订单更新失败');
+            case 32:
+              this.store.currentOrder = updated;
+              _context10.next = 35;
+              return this.updateStateAmountToRemaining(false);
+            case 35:
+              this.logInfo('本地订单更新成功(保留支付项):', {
+                orderId: params.orderId,
+                uuid: updated.uuid,
+                payments: ((_updated$payment = updated.payment) === null || _updated$payment === void 0 ? void 0 : _updated$payment.length) || 0,
+                totalAmount: updated.total_amount,
+                expectAmount: updated.expect_amount
+              });
+
+              // 事件通知（复用创建事件，便于上层监听刷新）
+              _context10.next = 38;
+              return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
+                order: updated,
+                timestamp: Date.now()
+              });
+            case 38:
+              // 需要减去已经同步给后端的支付过的钱
+              syncedAmount = activePayments.reduce(function (sum, p) {
+                var amt = new Decimal(p.amount || '0');
+                var rounding = new Decimal(p.rounding_amount || '0').abs();
+                return sum.plus(amt).plus(rounding);
+              }, new Decimal(0));
+              remainingExpectAmount = Decimal.max(0, totalAmount.minus(syncedAmount)).toFixed(2);
+              this.initWalletData({
+                order_wait_pay_amount: Number(remainingExpectAmount)
+              });
+              return _context10.abrupt("return", updated);
+            case 42:
+              // 计算是否需要支付定金，如果需要默认切换到定金模式，以及记录定金总金额，并把当前默认待付金额调整为定金总金额
+              isNeedDeposit = this.checkIsNeedDepositAsync(params.orderData.bookings, params.orderData.relation_products); // 没找到现有订单时，回退为创建逻辑（用于异常兜底）
+              _context10.next = 45;
+              return this.payment.createPaymentOrderAsync({
+                order_id: String(params.orderId),
+                total_amount: amountInfo.totalAmount,
+                is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+                deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : '0.00',
+                order_info: {
+                  original_order_data: params.orderData,
+                  cart_summary: params.cartSummary,
+                  created_at: new Date().toISOString(),
+                  platform: params.orderData.platform,
+                  type: params.orderData.type,
+                  schedule_date: params.orderData.schedule_date,
+                  shop_note: params.orderData.shop_note,
+                  amount_breakdown: amountInfo
+                }
+              });
+            case 45:
+              created = _context10.sent;
+              this.store.currentOrder = created;
+              this.initWalletData();
+              return _context10.abrupt("return", created);
+            case 49:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10, this);
+      }));
+      function updateLocalOrderAsync(_x12) {
+        return _updateLocalOrderAsync.apply(this, arguments);
+      }
+      return updateLocalOrderAsync;
+    }()
     /**
      * 完成结账
      */
@@ -612,31 +846,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "completeCheckoutAsync",
     value: (function () {
-      var _completeCheckoutAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _completeCheckoutAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var order;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context10.prev = 0;
+              _context11.prev = 0;
               if (this.store.currentOrder) {
-                _context10.next = 3;
+                _context11.next = 3;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '未找到当前订单');
             case 3:
-              _context10.next = 5;
+              _context11.next = 5;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
             case 5:
-              order = _context10.sent;
+              order = _context11.sent;
               if (!(!order || order.payment_status !== PaymentStatus.Finished)) {
-                _context10.next = 8;
+                _context11.next = 8;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '订单支付未完成，无法完成结账');
             case 8:
               // 清理钱包模块的所有缓存数据
               this.payment.wallet.clearAllCache();
-              _context10.next = 11;
+              _context11.next = 11;
               return this.core.effects.emit(CheckoutHooks.OnCheckoutCompleted, {
                 orderId: order.id,
                 timestamp: Date.now()
@@ -645,27 +879,27 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.log('[Checkout] 结账流程完成:', order.id);
 
               // 🔧 新增：自动重置 store 状态
-              _context10.next = 14;
+              _context11.next = 14;
               return this.resetStoreStateAsync();
             case 14:
-              return _context10.abrupt("return", {
+              return _context11.abrupt("return", {
                 success: true,
                 orderId: String(order.id)
               });
             case 17:
-              _context10.prev = 17;
-              _context10.t0 = _context10["catch"](0);
-              _context10.next = 21;
-              return this.handleError(_context10.t0, CheckoutErrorType.UnknownError);
+              _context11.prev = 17;
+              _context11.t0 = _context11["catch"](0);
+              _context11.next = 21;
+              return this.handleError(_context11.t0, CheckoutErrorType.UnknownError);
             case 21:
-              return _context10.abrupt("return", {
+              return _context11.abrupt("return", {
                 success: false
               });
             case 22:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this, [[0, 17]]);
+        }, _callee11, this, [[0, 17]]);
       }));
       function completeCheckoutAsync() {
         return _completeCheckoutAsync.apply(this, arguments);
@@ -679,8 +913,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderOriginalData",
     value: function getOrderOriginalData() {
-      var _this$store$currentOr5;
-      return (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.order_info;
+      var _this$store$currentOr8;
+      return (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.order_info;
     }
 
     /**
@@ -735,35 +969,35 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCurrentOrderPaymentItemsAsync",
     value: (function () {
-      var _getCurrentOrderPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _getCurrentOrderPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var _currentOrder2, paymentItems;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context11.prev = 0;
+              _context12.prev = 0;
               _currentOrder2 = this.store.currentOrder;
               if (_currentOrder2) {
-                _context11.next = 5;
+                _context12.next = 5;
                 break;
               }
               console.log('[Checkout] 当前没有活跃订单，无法获取支付项');
-              return _context11.abrupt("return", []);
+              return _context12.abrupt("return", []);
             case 5:
-              _context11.next = 7;
+              _context12.next = 7;
               return this.payment.getPaymentItemsAsync(_currentOrder2.uuid);
             case 7:
-              paymentItems = _context11.sent;
-              return _context11.abrupt("return", paymentItems);
+              paymentItems = _context12.sent;
+              return _context12.abrupt("return", paymentItems);
             case 11:
-              _context11.prev = 11;
-              _context11.t0 = _context11["catch"](0);
-              console.error('[Checkout] 获取当前订单支付项失败:', _context11.t0);
-              return _context11.abrupt("return", []);
+              _context12.prev = 11;
+              _context12.t0 = _context12["catch"](0);
+              console.error('[Checkout] 获取当前订单支付项失败:', _context12.t0);
+              return _context12.abrupt("return", []);
             case 15:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this, [[0, 11]]);
+        }, _callee12, this, [[0, 11]]);
       }));
       function getCurrentOrderPaymentItemsAsync() {
         return _getCurrentOrderPaymentItemsAsync.apply(this, arguments);
@@ -800,32 +1034,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "replaceLocalOrderIdAsync",
     value: (function () {
-      var _replaceLocalOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(newOrderId) {
+      var _replaceLocalOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(newOrderId) {
         var updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _context12.prev = 0;
+              _context13.prev = 0;
               if (this.store.currentOrder) {
-                _context12.next = 4;
+                _context13.next = 4;
                 break;
               }
               console.warn('[Checkout] 没有当前订单，无法替换订单ID');
-              return _context12.abrupt("return", null);
+              return _context13.abrupt("return", null);
             case 4:
-              _context12.next = 6;
+              _context13.next = 6;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, newOrderId);
             case 6:
-              updatedOrder = _context12.sent;
+              updatedOrder = _context13.sent;
               if (!updatedOrder) {
-                _context12.next = 15;
+                _context13.next = 15;
                 break;
               }
               // 更新当前订单引用
               this.store.currentOrder = updatedOrder;
 
               // 触发订单更新事件
-              _context12.next = 11;
+              _context13.next = 11;
               return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
                 order: updatedOrder,
                 timestamp: Date.now()
@@ -840,25 +1074,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.isOrderSynced = true;
 
               // 订单ID替换后更新 stateAmount
-              _context12.next = 15;
-              return this.updateStateAmountToRemaining();
+              _context13.next = 15;
+              return this.updateStateAmountToRemaining(false);
             case 15:
-              return _context12.abrupt("return", updatedOrder);
+              return _context13.abrupt("return", updatedOrder);
             case 18:
-              _context12.prev = 18;
-              _context12.t0 = _context12["catch"](0);
-              console.error('[Checkout] 替换订单ID失败:', _context12.t0);
-              _context12.next = 23;
-              return this.handleError(_context12.t0, CheckoutErrorType.UnknownError);
+              _context13.prev = 18;
+              _context13.t0 = _context13["catch"](0);
+              console.error('[Checkout] 替换订单ID失败:', _context13.t0);
+              _context13.next = 23;
+              return this.handleError(_context13.t0, CheckoutErrorType.UnknownError);
             case 23:
-              return _context12.abrupt("return", null);
+              return _context13.abrupt("return", null);
             case 24:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this, [[0, 18]]);
+        }, _callee13, this, [[0, 18]]);
       }));
-      function replaceLocalOrderIdAsync(_x12) {
+      function replaceLocalOrderIdAsync(_x13) {
         return _replaceLocalOrderIdAsync.apply(this, arguments);
       }
       return replaceLocalOrderIdAsync;
@@ -874,16 +1108,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setStateAmountAsync",
     value: (function () {
-      var _setStateAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(amount) {
+      var _setStateAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(amount) {
         var numAmount, oldAmount, formattedAmount, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              _context13.prev = 0;
+              _context14.prev = 0;
               // 验证金额格式
               numAmount = parseFloat(amount);
               if (!(isNaN(numAmount) || numAmount < 0)) {
-                _context13.next = 4;
+                _context14.next = 4;
                 break;
               }
               throw new Error("\u65E0\u6548\u7684\u652F\u4ED8\u91D1\u989D: ".concat(amount));
@@ -891,10 +1125,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               oldAmount = this.store.stateAmount;
               formattedAmount = numAmount.toFixed(2); // 如果金额没有变化，直接返回
               if (!(oldAmount === formattedAmount)) {
-                _context13.next = 8;
+                _context14.next = 8;
                 break;
               }
-              return _context13.abrupt("return");
+              return _context14.abrupt("return");
             case 8:
               this.logInfo('[Checkout] 设置自定义支付金额:', {
                 oldAmount: oldAmount,
@@ -905,31 +1139,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.stateAmount = formattedAmount;
 
               // 触发金额变更事件
-              _context13.next = 12;
+              _context14.next = 12;
               return this.core.effects.emit(CheckoutHooks.OnStateAmountChanged, {
                 oldAmount: oldAmount,
                 newAmount: formattedAmount,
                 timestamp: Date.now()
               });
             case 12:
-              _context13.next = 21;
+              _context14.next = 21;
               break;
             case 14:
-              _context13.prev = 14;
-              _context13.t0 = _context13["catch"](0);
-              errorMessage = _context13.t0 instanceof Error ? _context13.t0.message : '设置支付金额失败';
+              _context14.prev = 14;
+              _context14.t0 = _context14["catch"](0);
+              errorMessage = _context14.t0 instanceof Error ? _context14.t0.message : '设置支付金额失败';
               console.error('[Checkout] 设置自定义支付金额失败:', errorMessage);
-              _context13.next = 20;
+              _context14.next = 20;
               return this.handleError(new Error(errorMessage), CheckoutErrorType.ValidationFailed);
             case 20:
-              throw _context13.t0;
+              throw _context14.t0;
             case 21:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this, [[0, 14]]);
+        }, _callee14, this, [[0, 14]]);
       }));
-      function setStateAmountAsync(_x13) {
+      function setStateAmountAsync(_x14) {
         return _setStateAmountAsync.apply(this, arguments);
       }
       return setStateAmountAsync;
@@ -997,39 +1231,39 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPaymentMethodsAsync",
     value: (function () {
-      var _getPaymentMethodsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _getPaymentMethodsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var methods;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
               if (!(this.store.paymentMethods && this.store.paymentMethods.length > 0)) {
-                _context14.next = 3;
+                _context15.next = 3;
                 break;
               }
               this.logInfo("\u4F7F\u7528\u7F13\u5B58\u7684\u652F\u4ED8\u65B9\u5F0F\u6570\u636E\uFF0C\u5171 ".concat(this.store.paymentMethods.length, " \u79CD"));
-              return _context14.abrupt("return", this.store.paymentMethods);
+              return _context15.abrupt("return", this.store.paymentMethods);
             case 3:
               // 如果缓存为空，调用 Payment 模块获取
               this.logInfo('store 中无缓存，从 Payment 模块获取支付方式...');
-              _context14.prev = 4;
-              _context14.next = 7;
+              _context15.prev = 4;
+              _context15.next = 7;
               return this.payment.getPayMethodListAsync();
             case 7:
-              methods = _context14.sent;
+              methods = _context15.sent;
               // 更新缓存
               this.store.paymentMethods = methods;
               this.logInfo("\u4ECE Payment \u6A21\u5757\u83B7\u53D6\u5230 ".concat(methods.length, " \u79CD\u652F\u4ED8\u65B9\u5F0F\uFF0C\u5DF2\u66F4\u65B0\u7F13\u5B58"));
-              return _context14.abrupt("return", methods);
+              return _context15.abrupt("return", methods);
             case 13:
-              _context14.prev = 13;
-              _context14.t0 = _context14["catch"](4);
-              this.logError('获取支付方式失败:', _context14.t0);
-              return _context14.abrupt("return", []);
+              _context15.prev = 13;
+              _context15.t0 = _context15["catch"](4);
+              this.logError('获取支付方式失败:', _context15.t0);
+              return _context15.abrupt("return", []);
             case 17:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this, [[4, 13]]);
+        }, _callee15, this, [[4, 13]]);
       }));
       function getPaymentMethodsAsync() {
         return _getPaymentMethodsAsync.apply(this, arguments);
@@ -1048,25 +1282,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addPaymentItemAsync",
     value: (function () {
-      var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(paymentItem) {
+      var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentItem) {
         var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, _isCashPayment, isCustomePayment, syncResult;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
               this.logInfo('addPaymentItemAsync called', paymentItem);
-              _context15.prev = 1;
+              _context16.prev = 1;
               if (this.store.currentOrder) {
-                _context15.next = 4;
+                _context16.next = 4;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '未找到当前订单，无法添加支付项');
             case 4:
               // 根据当前订单的定金状态设置订单支付类型
               orderPaymentType = this.store.currentOrder.is_deposit === 1 ? 'deposit' : 'normal'; // 处理现金支付的找零逻辑
-              _context15.next = 7;
+              _context16.next = 7;
               return this.processCashPaymentItem(paymentItem);
             case 7:
-              processedPaymentItem = _context15.sent;
+              processedPaymentItem = _context16.sent;
               // 从 otherParams 获取 metadata 字段
               metadata = _objectSpread(_objectSpread({}, processedPaymentItem.metadata), {}, {
                 rounding_rule: this.otherParams.order_rounding_setting,
@@ -1076,21 +1310,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 order_payment_type: orderPaymentType,
                 metadata: metadata
               }); // 添加支付项到订单
-              _context15.next = 12;
+              _context16.next = 12;
               return this.payment.addPaymentItemAsync(this.store.currentOrder.uuid, paymentItemWithType);
             case 12:
               this.logInfo('支付项添加成功');
 
               // 支付项添加后，更新 stateAmount 为剩余未支付金额
-              _context15.next = 15;
+              _context16.next = 15;
               return this.updateStateAmountToRemaining();
             case 15:
-              _context15.next = 17;
+              _context16.next = 17;
               return this.calculateRemainingAmountAsync();
             case 17:
-              remainingAmount = _context15.sent;
+              remainingAmount = _context16.sent;
               if (!(Number(remainingAmount) > 0)) {
-                _context15.next = 38;
+                _context16.next = 38;
                 break;
               }
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
@@ -1105,56 +1339,55 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currentOrderSynced: this.store.isOrderSynced
               });
               if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
-                _context15.next = 38;
+                _context16.next = 38;
                 break;
               }
               this.logInfo('检测到 EFTPOS 支付，立即同步订单到后端...');
-              _context15.prev = 26;
-              _context15.next = 29;
+              _context16.prev = 26;
+              _context16.next = 29;
               return this.syncOrderToBackendWithReturn(true);
             case 29:
-              syncResult = _context15.sent;
+              syncResult = _context16.sent;
               this.logInfo('EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
                 orderId: syncResult.orderId,
                 isOrderSynced: this.store.isOrderSynced,
                 backendResponse: syncResult.response
               });
-              _context15.next = 38;
+              _context16.next = 38;
               break;
             case 33:
-              _context15.prev = 33;
-              _context15.t0 = _context15["catch"](26);
-              this.logError('EFTPOS 支付后订单同步失败:', _context15.t0);
+              _context16.prev = 33;
+              _context16.t0 = _context16["catch"](26);
+              this.logError('EFTPOS 支付后订单同步失败:', _context16.t0);
               // 不抛出错误，避免影响支付流程，但记录错误
-              _context15.next = 38;
-              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context15.t0 instanceof Error ? _context15.t0.message : String(_context15.t0))), CheckoutErrorType.OrderCreationFailed);
+              _context16.next = 38;
+              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context16.t0 instanceof Error ? _context16.t0.message : String(_context16.t0))), CheckoutErrorType.OrderCreationFailed);
             case 38:
-              _context15.next = 40;
-              return this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
+              // 触发支付项添加事件（可以复用支付开始事件）
+              this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
                 paymentMethodName: paymentItem.name,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 40:
-              _context15.next = 48;
+              _context16.next = 47;
               break;
-            case 42:
-              _context15.prev = 42;
-              _context15.t1 = _context15["catch"](1);
-              this.logError('添加支付项失败:', _context15.t1);
-              _context15.next = 47;
-              return this.handleError(_context15.t1, CheckoutErrorType.PaymentFailed);
+            case 41:
+              _context16.prev = 41;
+              _context16.t1 = _context16["catch"](1);
+              this.logError('添加支付项失败:', _context16.t1);
+              _context16.next = 46;
+              return this.handleError(_context16.t1, CheckoutErrorType.PaymentFailed);
+            case 46:
+              throw _context16.t1;
             case 47:
-              throw _context15.t1;
-            case 48:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this, [[1, 42], [26, 33]]);
+        }, _callee16, this, [[1, 41], [26, 33]]);
       }));
-      function addPaymentItemAsync(_x14) {
+      function addPaymentItemAsync(_x15) {
         return _addPaymentItemAsync.apply(this, arguments);
       }
       return addPaymentItemAsync;
@@ -1172,14 +1405,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "deletePaymentItemAsync",
     value: (function () {
-      var _deletePaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentUuid) {
+      var _deletePaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(paymentUuid) {
         var currentPayments, paymentItem, currentOrderId, isCurrentOrderReal, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _context16.prev = 0;
+              _context17.prev = 0;
               if (this.store.currentOrder) {
-                _context16.next = 3;
+                _context17.next = 3;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '当前没有活跃订单，无法删除支付项');
@@ -1190,16 +1423,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 从 Payment 模块验证支付项是否存在
-              _context16.next = 6;
+              _context17.next = 6;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid, true // 包括已撤销的支付项，因为我们需要验证是否存在
               );
             case 6:
-              currentPayments = _context16.sent;
+              currentPayments = _context17.sent;
               paymentItem = currentPayments.find(function (p) {
                 return p.uuid === paymentUuid;
               });
               if (paymentItem) {
-                _context16.next = 10;
+                _context17.next = 10;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u652F\u4ED8\u9879\u4E0D\u5B58\u5728: ".concat(paymentUuid));
@@ -1212,7 +1445,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用 Payment 模块删除支付项
-              _context16.next = 13;
+              _context17.next = 13;
               return this.payment.deletePaymentAsync(this.store.currentOrder.uuid, paymentUuid);
             case 13:
               this.logInfo('Payment支付项删除完成', paymentItem);
@@ -1220,10 +1453,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context16.next = 18;
+              _context17.next = 18;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
             case 18:
-              updatedOrder = _context16.sent;
+              updatedOrder = _context17.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
                 if (isCurrentOrderReal && isVirtualOrderId(updatedOrder.order_id)) {
@@ -1237,10 +1470,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context16.next = 22;
-              return this.updateStateAmountToRemaining();
+              _context17.next = 22;
+              return this.updateStateAmountToRemaining(false);
             case 22:
-              _context16.next = 24;
+              _context17.next = 24;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
@@ -1249,23 +1482,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 24:
-              _context16.next = 32;
+              _context17.next = 32;
               break;
             case 26:
-              _context16.prev = 26;
-              _context16.t0 = _context16["catch"](0);
-              this.logError('删除支付项失败:', _context16.t0);
-              _context16.next = 31;
-              return this.handleError(_context16.t0, CheckoutErrorType.PaymentFailed);
+              _context17.prev = 26;
+              _context17.t0 = _context17["catch"](0);
+              this.logError('删除支付项失败:', _context17.t0);
+              _context17.next = 31;
+              return this.handleError(_context17.t0, CheckoutErrorType.PaymentFailed);
             case 31:
-              throw _context16.t0;
+              throw _context17.t0;
             case 32:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this, [[0, 26]]);
+        }, _callee17, this, [[0, 26]]);
       }));
-      function deletePaymentItemAsync(_x15) {
+      function deletePaymentItemAsync(_x16) {
         return _deletePaymentItemAsync.apply(this, arguments);
       }
       return deletePaymentItemAsync;
@@ -1284,27 +1517,34 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateVoucherPaymentItemsAsync",
     value: (function () {
-      var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(voucherPaymentItems) {
+      var _updateVoucherPaymentItemsAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(voucherPaymentItems) {
         var _this3 = this;
-        var remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        var paymentItems, allPaymentItemsSynced, remainingAmount, remainingValue, isOrderSynced, orderPaymentType, voucherPaymentItemsWithType, currentOrderId, isCurrentOrderReal, updatedOrder;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              _context17.prev = 0;
+              _context18.prev = 0;
               if (this.store.currentOrder) {
-                _context17.next = 3;
+                _context18.next = 3;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '当前没有活跃订单，无法更新代金券支付项');
             case 3:
-              _context17.next = 5;
-              return this.calculateRemainingAmountAsync();
+              _context18.next = 5;
+              return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 5:
-              remainingAmount = _context17.sent;
+              paymentItems = _context18.sent;
+              allPaymentItemsSynced = paymentItems.every(function (item) {
+                return item.isSynced;
+              });
+              _context18.next = 9;
+              return this.calculateRemainingAmountAsync();
+            case 9:
+              remainingAmount = _context18.sent;
               remainingValue = new Decimal(remainingAmount);
               isOrderSynced = this.store.isOrderSynced;
-              if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0)) {
-                _context17.next = 11;
+              if (!(remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced)) {
+                _context18.next = 15;
                 break;
               }
               this.logInfo('订单已同步且支付完成，跳过清空代金券操作避免重复同步:', {
@@ -1315,8 +1555,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 voucherPaymentItemsCount: voucherPaymentItems.length,
                 reason: 'Order synced and payment completed, skip clear vouchers to avoid duplicate sync'
               });
-              return _context17.abrupt("return");
-            case 11:
+              return _context18.abrupt("return");
+            case 15:
               this.logInfo('开始批量更新代金券支付项:', {
                 voucherPaymentItems: voucherPaymentItems
               });
@@ -1338,16 +1578,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   metadata: metadata
                 });
               }); // 调用 Payment 模块的批量更新方法
-              _context17.next = 16;
+              _context18.next = 20;
               return this.payment.updateVoucherPaymentItemsAsync(this.store.currentOrder.uuid, voucherPaymentItemsWithType);
-            case 16:
+            case 20:
               // 重新从Payment模块获取最新的订单数据，确保支付项同步
               currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
               isCurrentOrderReal = currentOrderId && !isVirtualOrderId(currentOrderId);
-              _context17.next = 20;
+              _context18.next = 24;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-            case 20:
-              updatedOrder = _context17.sent;
+            case 24:
+              updatedOrder = _context18.sent;
               if (updatedOrder) {
                 // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
                 if (isCurrentOrderReal && isVirtualOrderId(updatedOrder.order_id)) {
@@ -1361,10 +1601,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 更新 stateAmount 为剩余未支付金额
-              _context17.next = 24;
-              return this.updateStateAmountToRemaining();
-            case 24:
-              _context17.next = 26;
+              _context18.next = 28;
+              return this.updateStateAmountToRemaining(false);
+            case 28:
+              _context18.next = 30;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: 'VOUCHER_BATCH',
@@ -1373,25 +1613,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }, 0).toFixed(2),
                 timestamp: Date.now()
               });
-            case 26:
+            case 30:
               this.logInfo('代金券支付项批量更新成功');
-              _context17.next = 35;
+              _context18.next = 39;
               break;
-            case 29:
-              _context17.prev = 29;
-              _context17.t0 = _context17["catch"](0);
-              this.logError('[Checkout] 批量更新代金券支付项失败:', _context17.t0);
-              _context17.next = 34;
-              return this.handleError(_context17.t0, CheckoutErrorType.PaymentFailed);
-            case 34:
-              throw _context17.t0;
-            case 35:
+            case 33:
+              _context18.prev = 33;
+              _context18.t0 = _context18["catch"](0);
+              this.logError('[Checkout] 批量更新代金券支付项失败:', _context18.t0);
+              _context18.next = 38;
+              return this.handleError(_context18.t0, CheckoutErrorType.PaymentFailed);
+            case 38:
+              throw _context18.t0;
+            case 39:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this, [[0, 29]]);
+        }, _callee18, this, [[0, 33]]);
       }));
-      function updateVoucherPaymentItemsAsync(_x16) {
+      function updateVoucherPaymentItemsAsync(_x17) {
         return _updateVoucherPaymentItemsAsync.apply(this, arguments);
       }
       return updateVoucherPaymentItemsAsync;
@@ -1408,20 +1648,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderDepositStatusAsync",
     value: (function () {
-      var _updateOrderDepositStatusAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(isDeposit) {
-        var newDepositValue, oldDepositValue, updateParams;
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _updateOrderDepositStatusAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(isDeposit) {
+        var newDepositValue, oldDepositValue, deposit_amount, updateParams;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _context18.prev = 0;
+              _context19.prev = 0;
               if (!(isDeposit !== 0 && isDeposit !== 1)) {
-                _context18.next = 3;
+                _context19.next = 3;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, 'isDeposit 参数只能是 0（全款订单）或 1（定金订单）');
             case 3:
               if (this.store.currentOrder) {
-                _context18.next = 5;
+                _context19.next = 5;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '未找到当前订单，无法修改定金状态');
@@ -1429,25 +1669,33 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               newDepositValue = isDeposit;
               oldDepositValue = this.store.currentOrder.is_deposit; // 如果状态没有变化，直接返回
               if (!(oldDepositValue === newDepositValue)) {
-                _context18.next = 10;
+                _context19.next = 10;
                 break;
               }
               console.log('[Checkout] 定金状态无变化，跳过更新');
-              return _context18.abrupt("return");
+              return _context19.abrupt("return");
             case 10:
+              deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : '0.00'; // 如果原来没有 deposit_amount，则默认把待付金额置为 deposit_amount
+              if (!deposit_amount || Number(deposit_amount) === 0) {
+                deposit_amount = this.store.currentOrder.expect_amount;
+              }
+
               // 准备更新参数
               updateParams = {
-                is_deposit: newDepositValue
+                is_deposit: newDepositValue,
+                deposit_amount: deposit_amount
               }; // 如果从定金改为全款，可以清空定金金额
-              if (isDeposit === 0 && this.store.currentOrder.deposit_amount !== '0.00') {
-                updateParams.deposit_amount = '0.00';
-                this.logInfo('订单从定金改为全款，清空定金金额');
-              }
-
+              // if (
+              //   isDeposit === 0 &&
+              //   this.store.currentOrder.deposit_amount !== '0.00'
+              // ) {
+              //   updateParams.deposit_amount = '0.00';
+              //   this.logInfo('订单从定金改为全款，清空定金金额');
+              // }
               // 调用 Payment 模块更新订单
-              _context18.next = 14;
+              _context19.next = 15;
               return this.payment.updateOrderAsync(this.store.currentOrder.uuid, updateParams);
-            case 14:
+            case 15:
               // 更新本地缓存的订单对象
               this.store.currentOrder = _objectSpread(_objectSpread({}, this.store.currentOrder), updateParams);
 
@@ -1455,35 +1703,36 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               if (this.store.localOrderData) {
                 this.store.localOrderData.is_deposit = newDepositValue;
               }
+              this.updateStateAmountToRemaining(false);
 
               // 触发订单更新事件
-              _context18.next = 18;
+              _context19.next = 20;
               return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
                 order: this.store.currentOrder,
                 timestamp: Date.now()
               });
-            case 18:
+            case 20:
               this.logInfo('订单定金状态更新成功:', {
                 isDeposit: newDepositValue,
                 depositAmount: this.store.currentOrder.deposit_amount
               });
-              _context18.next = 27;
+              _context19.next = 29;
               break;
-            case 21:
-              _context18.prev = 21;
-              _context18.t0 = _context18["catch"](0);
-              this.logError('更新订单定金状态失败:', _context18.t0);
-              _context18.next = 26;
-              return this.handleError(_context18.t0, CheckoutErrorType.ValidationFailed);
-            case 26:
-              throw _context18.t0;
-            case 27:
+            case 23:
+              _context19.prev = 23;
+              _context19.t0 = _context19["catch"](0);
+              this.logError('更新订单定金状态失败:', _context19.t0);
+              _context19.next = 28;
+              return this.handleError(_context19.t0, CheckoutErrorType.ValidationFailed);
+            case 28:
+              throw _context19.t0;
+            case 29:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this, [[0, 21]]);
+        }, _callee19, this, [[0, 23]]);
       }));
-      function updateOrderDepositStatusAsync(_x17) {
+      function updateOrderDepositStatusAsync(_x18) {
         return _updateOrderDepositStatusAsync.apply(this, arguments);
       }
       return updateOrderDepositStatusAsync;
@@ -1501,59 +1750,51 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDepositAmountAsync",
     value: (function () {
-      var _setDepositAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(depositAmount) {
-        var _this$store$currentOr6, _this$store$currentOr7;
-        var depositValue, totalAmount, formattedDepositAmount, oldDepositAmount, updateParams;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+      var _setDepositAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(depositAmount) {
+        var _this$store$currentOr9, _this$store$currentOr10;
+        var depositValue, formattedDepositAmount, oldDepositAmount, updateParams;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
               this.logInfo('setDepositAmountAsync called', {
                 depositAmount: depositAmount,
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_id,
-                currentTotalAmount: (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.total_amount
+                currentOrderId: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_id,
+                currentTotalAmount: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.total_amount
               });
-              _context19.prev = 1;
+              _context20.prev = 1;
               // 验证定金金额格式
               depositValue = new Decimal(depositAmount);
               if (!(depositValue.isNaN() || depositValue.lt(0))) {
-                _context19.next = 5;
+                _context20.next = 5;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u65E0\u6548\u7684\u5B9A\u91D1\u91D1\u989D\u683C\u5F0F: ".concat(depositAmount));
             case 5:
               if (this.store.currentOrder) {
-                _context19.next = 7;
+                _context20.next = 7;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '未找到当前订单，无法设置定金金额');
             case 7:
-              // 使用 Decimal.js 进行安全比较，检查定金金额是否超过订单总额
-              totalAmount = new Decimal(this.store.currentOrder.total_amount || '0');
-              if (!depositValue.gt(totalAmount)) {
-                _context19.next = 10;
-                break;
-              }
-              throw createCheckoutError(CheckoutErrorType.ValidationFailed, "\u5B9A\u91D1\u91D1\u989D ".concat(depositAmount, " \u4E0D\u80FD\u8D85\u8FC7\u8BA2\u5355\u603B\u989D ").concat(totalAmount.toFixed(2)));
-            case 10:
               formattedDepositAmount = depositValue.toFixed(2);
               oldDepositAmount = this.store.currentOrder.deposit_amount || '0.00'; // 如果定金金额没有变化，直接返回
               if (!(formattedDepositAmount === oldDepositAmount)) {
-                _context19.next = 15;
+                _context20.next = 12;
                 break;
               }
               this.logInfo('定金金额无变化，跳过更新:', {
                 currentAmount: oldDepositAmount,
                 newAmount: formattedDepositAmount
               });
-              return _context19.abrupt("return");
-            case 15:
+              return _context20.abrupt("return");
+            case 12:
               this.logInfo('开始设置订单定金金额:', {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
                 oldDepositAmount: oldDepositAmount,
                 newDepositAmount: formattedDepositAmount,
-                totalAmount: totalAmount.toFixed(2)
+                totalAmount: this.store.currentOrder.total_amount
               });
 
               // 准备更新参数
@@ -1571,9 +1812,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 调用 Payment 模块更新订单
-              _context19.next = 20;
+              _context20.next = 17;
               return this.payment.updateOrderAsync(this.store.currentOrder.uuid, updateParams);
-            case 20:
+            case 17:
               // 更新本地缓存的订单对象
               this.store.currentOrder = _objectSpread(_objectSpread({}, this.store.currentOrder), updateParams);
 
@@ -1588,14 +1829,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   this.store.localOrderData.is_deposit = updateParams.is_deposit;
                 }
               }
+              this.updateStateAmountToRemaining(false);
 
               // 触发订单更新事件
-              _context19.next = 24;
+              _context20.next = 22;
               return this.core.effects.emit(CheckoutHooks.OnOrderCreated, {
                 order: this.store.currentOrder,
                 timestamp: Date.now()
               });
-            case 24:
+            case 22:
               this.logInfo('订单定金金额设置成功:', {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -1604,23 +1846,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isDeposit: this.store.currentOrder.is_deposit,
                 totalAmount: this.store.currentOrder.total_amount
               });
-              _context19.next = 33;
+              _context20.next = 31;
               break;
-            case 27:
-              _context19.prev = 27;
-              _context19.t0 = _context19["catch"](1);
-              this.logError('设置订单定金金额失败:', _context19.t0);
-              _context19.next = 32;
-              return this.handleError(_context19.t0, CheckoutErrorType.ValidationFailed);
-            case 32:
-              throw _context19.t0;
-            case 33:
+            case 25:
+              _context20.prev = 25;
+              _context20.t0 = _context20["catch"](1);
+              this.logError('设置订单定金金额失败:', _context20.t0);
+              _context20.next = 30;
+              return this.handleError(_context20.t0, CheckoutErrorType.ValidationFailed);
+            case 30:
+              throw _context20.t0;
+            case 31:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this, [[1, 27]]);
+        }, _callee20, this, [[1, 25]]);
       }));
-      function setDepositAmountAsync(_x18) {
+      function setDepositAmountAsync(_x19) {
         return _setDepositAmountAsync.apply(this, arguments);
       }
       return setDepositAmountAsync;
@@ -1634,26 +1876,26 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "manualSyncOrderAsync",
     value: (function () {
-      var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _this$store$currentOr8, _this$store$currentOr9, _this$store$currentOr10;
-        var orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, _this$store$currentOr11, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        var _this$store$currentOr11, _this$store$currentOr12, _this$store$currentOr13;
+        var _this$store$currentOr14, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr15, errorMessage;
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               this.logInfo('manualSyncOrderAsync called', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.order_id,
-                orderUuid: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.uuid,
-                totalAmount: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.total_amount,
+                currentOrderId: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.order_id,
+                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
+                totalAmount: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.total_amount,
                 isOrderSynced: this.store.isOrderSynced,
                 isVirtualOrderId: this.store.currentOrder ? isVirtualOrderId(this.store.currentOrder.order_id) : false
               });
-              _context20.prev = 1;
+              _context21.prev = 1;
               if (this.store.currentOrder) {
-                _context20.next = 4;
+                _context21.next = 4;
                 break;
               }
-              return _context20.abrupt("return", {
+              return _context21.abrupt("return", {
                 success: false,
                 message: '当前没有活跃订单，无法同步'
               });
@@ -1663,25 +1905,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               if (this.store.isOrderSynced) {
                 this.logInfo('订单已同步过，将执行更新操作');
               }
-              _context20.t0 = this;
-              _context20.t1 = orderUuid;
-              _context20.t2 = oldOrderId;
-              _context20.t3 = this.store.currentOrder.total_amount;
-              _context20.next = 13;
+              _context21.t0 = this;
+              _context21.t1 = orderUuid;
+              _context21.t2 = oldOrderId;
+              _context21.t3 = this.store.currentOrder.total_amount;
+              _context21.next = 13;
               return this.calculateRemainingAmountAsync();
             case 13:
-              _context20.t4 = _context20.sent;
-              _context20.t5 = {
-                orderUuid: _context20.t1,
-                orderId: _context20.t2,
-                totalAmount: _context20.t3,
-                remainingAmount: _context20.t4
+              _context21.t4 = _context21.sent;
+              _context21.t5 = {
+                orderUuid: _context21.t1,
+                orderId: _context21.t2,
+                totalAmount: _context21.t3,
+                remainingAmount: _context21.t4
               };
-              _context20.t0.logInfo.call(_context20.t0, '开始手动同步订单到后端:', _context20.t5);
-              _context20.next = 18;
+              _context21.t0.logInfo.call(_context21.t0, '开始手动同步订单到后端:', _context21.t5);
+              _context21.next = 18;
               return this.syncOrderToBackendWithReturn(true);
             case 18:
-              syncResult = _context20.sent;
+              syncResult = _context21.sent;
               this.logInfo('手动同步订单完成:', {
                 orderUuid: orderUuid,
                 syncResult: syncResult,
@@ -1699,22 +1941,28 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               if (syncResult.orderId !== finalOrderId) {
                 this.logError('[Checkout] 严重警告：返回的订单ID与存储的订单ID不一致！');
               }
-              return _context20.abrupt("return", syncResult);
+              newRes = _objectSpread(_objectSpread({}, syncResult), {}, {
+                is_deposit: ((_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.is_deposit) || 0
+              });
+              _context21.next = 27;
+              return this.updateStateAmountToRemaining(false);
             case 27:
-              _context20.prev = 27;
-              _context20.t6 = _context20["catch"](1);
-              this.logError('手动同步订单失败:', _context20.t6);
-              errorMessage = _context20.t6 instanceof Error ? _context20.t6.message : '同步失败';
-              return _context20.abrupt("return", {
+              return _context21.abrupt("return", newRes);
+            case 30:
+              _context21.prev = 30;
+              _context21.t6 = _context21["catch"](1);
+              this.logError('手动同步订单失败:', _context21.t6);
+              errorMessage = _context21.t6 instanceof Error ? _context21.t6.message : '同步失败';
+              return _context21.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.uuid
+                orderUuid: (_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.uuid
               });
-            case 32:
+            case 35:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20, this, [[1, 27]]);
+        }, _callee21, this, [[1, 30]]);
       }));
       function manualSyncOrderAsync() {
         return _manualSyncOrderAsync.apply(this, arguments);
@@ -1784,27 +2032,27 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelCurrentOrderAsync",
     value: (function () {
-      var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(cancelReason) {
-        var _this$store$currentOr12, _this$store$currentOr13, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+      var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(cancelReason) {
+        var _this$store$currentOr16, _this$store$currentOr17, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _context21.prev = 0;
+              _context22.prev = 0;
               this.logInfo('开始取消当前本地订单:', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
-                orderId: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.order_id,
+                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid,
+                orderId: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.order_id,
                 isOrderSynced: this.store.isOrderSynced,
                 cancelReason: cancelReason
               });
 
               // 检查是否有当前订单
               if (this.store.currentOrder) {
-                _context21.next = 5;
+                _context22.next = 5;
                 break;
               }
               this.logInfo('没有当前订单，无需取消');
-              return _context21.abrupt("return", {
+              return _context22.abrupt("return", {
                 success: false,
                 message: '没有当前订单可取消'
               });
@@ -1813,31 +2061,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               currentOrderId = this.store.currentOrder.order_id;
               isOrderSynced = this.store.isOrderSynced; // 检查订单是否已同步，已同步的订单不能取消
               if (!isOrderSynced) {
-                _context21.next = 11;
+                _context22.next = 11;
                 break;
               }
               this.logInfo('订单已同步到后端，不能取消:', {
                 orderId: currentOrderId,
                 orderUuid: currentOrderUuid
               });
-              return _context21.abrupt("return", {
+              return _context22.abrupt("return", {
                 success: false,
                 message: '订单已同步到后端，无法取消',
                 orderId: currentOrderId
               });
             case 11:
-              _context21.prev = 11;
+              _context22.prev = 11;
               this.logInfo('删除本地订单数据');
-              _context21.next = 15;
+              _context22.next = 15;
               return this.payment.deletePaymentOrderAsync(currentOrderUuid);
             case 15:
               this.logInfo('本地订单数据删除成功');
-              _context21.next = 21;
+              _context22.next = 21;
               break;
             case 18:
-              _context21.prev = 18;
-              _context21.t0 = _context21["catch"](11);
-              this.logWarning('删除本地订单数据失败，但继续执行:', _context21.t0);
+              _context22.prev = 18;
+              _context22.t0 = _context22["catch"](11);
+              this.logWarning('删除本地订单数据失败，但继续执行:', _context22.t0);
             case 21:
               // 清理订单相关状态，确保正确释放 currentOrder
               this.logInfo('清理订单相关状态');
@@ -1853,7 +2101,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('订单状态清理完成，currentOrder已释放');
 
               // 触发订单取消事件
-              _context21.next = 32;
+              _context22.next = 32;
               return this.core.effects.emit(CheckoutHooks.OnOrderCancelled, {
                 orderUuid: currentOrderUuid,
                 orderId: currentOrderId,
@@ -1868,27 +2116,27 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: currentOrderId,
                 cancelReason: cancelReason
               });
-              return _context21.abrupt("return", {
+              return _context22.abrupt("return", {
                 success: true,
                 message: '本地订单已成功取消',
                 orderId: currentOrderId
               });
             case 36:
-              _context21.prev = 36;
-              _context21.t1 = _context21["catch"](0);
-              this.logError('取消本地订单失败:', _context21.t1);
-              errorMessage = _context21.t1 instanceof Error ? _context21.t1.message : '未知错误';
-              return _context21.abrupt("return", {
+              _context22.prev = 36;
+              _context22.t1 = _context22["catch"](0);
+              this.logError('取消本地订单失败:', _context22.t1);
+              errorMessage = _context22.t1 instanceof Error ? _context22.t1.message : '未知错误';
+              return _context22.abrupt("return", {
                 success: false,
                 message: "\u53D6\u6D88\u8BA2\u5355\u5931\u8D25: ".concat(errorMessage)
               });
             case 41:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this, [[0, 36], [11, 18]]);
+        }, _callee22, this, [[0, 36], [11, 18]]);
       }));
-      function cancelCurrentOrderAsync(_x19) {
+      function cancelCurrentOrderAsync(_x20) {
         return _cancelCurrentOrderAsync.apply(this, arguments);
       }
       return cancelCurrentOrderAsync;
@@ -1903,17 +2151,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "saveForLaterPaymentAsync",
     value: (function () {
-      var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr14, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr18, errorMessage;
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              _context22.prev = 0;
+              _context23.prev = 0;
               if (this.store.currentOrder) {
-                _context22.next = 3;
+                _context23.next = 3;
                 break;
               }
-              return _context22.abrupt("return", {
+              return _context23.abrupt("return", {
                 success: false,
                 message: '当前没有活跃订单，无法保存'
               });
@@ -1927,14 +2175,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 获取当前订单的所有支付项
-              _context22.next = 8;
+              _context23.next = 8;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 8:
-              allPaymentItems = _context22.sent;
-              _context22.next = 11;
+              allPaymentItems = _context23.sent;
+              _context23.next = 11;
               return this.syncOrderToBackendWithReturn(true, allPaymentItems);
             case 11:
-              syncResult = _context22.sent;
+              syncResult = _context23.sent;
               this.logInfo('保存订单完成:', {
                 orderUuid: orderUuid,
                 oldOrderId: currentOrderId,
@@ -1943,7 +2191,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isOrderSynced: this.store.isOrderSynced,
                 filteredPaymentsCount: allPaymentItems.length
               });
-              return _context22.abrupt("return", {
+              return _context23.abrupt("return", {
                 success: true,
                 message: '订单保存成功，可稍后继续支付',
                 orderId: syncResult.orderId,
@@ -1951,20 +2199,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 response: syncResult.response
               });
             case 16:
-              _context22.prev = 16;
-              _context22.t0 = _context22["catch"](0);
-              this.logError('保存订单失败:', _context22.t0);
-              errorMessage = _context22.t0 instanceof Error ? _context22.t0.message : '保存失败';
-              return _context22.abrupt("return", {
+              _context23.prev = 16;
+              _context23.t0 = _context23["catch"](0);
+              this.logError('保存订单失败:', _context23.t0);
+              errorMessage = _context23.t0 instanceof Error ? _context23.t0.message : '保存失败';
+              return _context23.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.uuid
+                orderUuid: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.uuid
               });
             case 21:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this, [[0, 16]]);
+        }, _callee23, this, [[0, 16]]);
       }));
       function saveForLaterPaymentAsync() {
         return _saveForLaterPaymentAsync.apply(this, arguments);
@@ -1980,20 +2228,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateOrderNoteAsync",
     value: (function () {
-      var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(note) {
-        var _this$store$currentOr15, _this$store$currentOr16, oldNote, orderInPayment;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(note) {
+        var _this$store$currentOr19, _this$store$currentOr20, oldNote, orderInPayment;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _context23.prev = 0;
+              _context24.prev = 0;
               if (this.store.localOrderData) {
-                _context23.next = 3;
+                _context24.next = 3;
                 break;
               }
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '没有本地订单数据，无法更新备注');
             case 3:
               console.log('[Checkout] 更新订单备注:', {
-                orderUuid: (_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.uuid,
+                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid,
                 oldNote: this.store.localOrderData.shop_note,
                 newNote: note
               });
@@ -2004,29 +2252,29 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 如果有当前订单，也同步到Payment模块中的订单数据
               if (!this.store.currentOrder) {
-                _context23.next = 17;
+                _context24.next = 17;
                 break;
               }
-              _context23.prev = 7;
-              _context23.next = 10;
+              _context24.prev = 7;
+              _context24.next = 10;
               return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
             case 10:
-              orderInPayment = _context23.sent;
+              orderInPayment = _context24.sent;
               if (orderInPayment && orderInPayment.note !== undefined) {
                 // 使用Payment模块的更新方法（如果有的话）
                 // 这里可能需要根据Payment模块的实际API来调整
                 console.log('[Checkout] 同步备注到Payment模块的订单数据中');
               }
-              _context23.next = 17;
+              _context24.next = 17;
               break;
             case 14:
-              _context23.prev = 14;
-              _context23.t0 = _context23["catch"](7);
-              console.warn('[Checkout] 同步备注到Payment模块失败，但本地更新成功:', _context23.t0);
+              _context24.prev = 14;
+              _context24.t0 = _context24["catch"](7);
+              console.warn('[Checkout] 同步备注到Payment模块失败，但本地更新成功:', _context24.t0);
             case 17:
-              _context23.next = 19;
+              _context24.next = 19;
               return this.core.effects.emit(CheckoutHooks.OnOrderNoteChanged, {
-                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid,
+                orderUuid: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.uuid,
                 oldNote: oldNote,
                 newNote: note,
                 timestamp: Date.now()
@@ -2036,23 +2284,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldNote: oldNote,
                 newNote: note
               });
-              _context23.next = 28;
+              _context24.next = 28;
               break;
             case 22:
-              _context23.prev = 22;
-              _context23.t1 = _context23["catch"](0);
-              console.error('[Checkout] 更新订单备注失败:', _context23.t1);
-              _context23.next = 27;
-              return this.handleError(_context23.t1, CheckoutErrorType.ValidationFailed);
+              _context24.prev = 22;
+              _context24.t1 = _context24["catch"](0);
+              console.error('[Checkout] 更新订单备注失败:', _context24.t1);
+              _context24.next = 27;
+              return this.handleError(_context24.t1, CheckoutErrorType.ValidationFailed);
             case 27:
-              throw _context23.t1;
+              throw _context24.t1;
             case 28:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this, [[0, 22], [7, 14]]);
+        }, _callee24, this, [[0, 22], [7, 14]]);
       }));
-      function updateOrderNoteAsync(_x20) {
+      function updateOrderNoteAsync(_x21) {
         return _updateOrderNoteAsync.apply(this, arguments);
       }
       return updateOrderNoteAsync;
@@ -2064,14 +2312,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "handleError",
     value: (function () {
-      var _handleError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(error, type) {
+      var _handleError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(error, type) {
         var checkoutError;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               checkoutError = error instanceof Error && 'type' in error ? error : createCheckoutError(type, error.message, error);
               this.store.lastError = checkoutError;
-              _context24.next = 4;
+              _context25.next = 4;
               return this.core.effects.emit(CheckoutHooks.OnError, {
                 error: checkoutError,
                 context: {},
@@ -2081,11 +2329,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.error('[Checkout] 错误:', checkoutError);
             case 5:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function handleError(_x21, _x22) {
+      function handleError(_x22, _x23) {
         return _handleError.apply(this, arguments);
       }
       return handleError;
@@ -2097,31 +2345,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "handlePaymentSuccess",
     value: (function () {
-      var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(data) {
-        var _this$store$currentOr17;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+      var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(data) {
+        var _this$store$currentOr21;
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _context25.next = 2;
+              _context26.next = 2;
               return this.updateStateAmountToRemaining();
             case 2:
-              _context25.next = 4;
+              _context26.next = 4;
               return this.core.effects.emit(CheckoutHooks.OnPaymentSuccess, {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.total_amount) || '0',
+                amount: ((_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 4:
-              _context25.next = 6;
+              _context26.next = 6;
               return this.completeCheckoutAsync();
             case 6:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function handlePaymentSuccess(_x23) {
+      function handlePaymentSuccess(_x24) {
         return _handlePaymentSuccess.apply(this, arguments);
       }
       return handlePaymentSuccess;
@@ -2133,30 +2381,30 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "handlePaymentError",
     value: (function () {
-      var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(data) {
-        var _this$store$currentOr18;
+      var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(data) {
+        var _this$store$currentOr22;
         var error;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               error = createCheckoutError(CheckoutErrorType.PaymentFailed, data.error || '支付同步失败');
-              _context26.next = 3;
+              _context27.next = 3;
               return this.handleError(error instanceof Error ? error : new Error(String(error)), CheckoutErrorType.PaymentFailed);
             case 3:
-              _context26.next = 5;
+              _context27.next = 5;
               return this.core.effects.emit(CheckoutHooks.OnPaymentFailed, {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.total_amount) || '0',
+                amount: ((_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 5:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function handlePaymentError(_x24) {
+      function handlePaymentError(_x25) {
         return _handlePaymentError.apply(this, arguments);
       }
       return handlePaymentError;
@@ -2180,43 +2428,43 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "processCashPaymentItem",
     value: (function () {
-      var _processCashPaymentItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(paymentItem) {
+      var _processCashPaymentItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(paymentItem) {
         var cashPayment, remainingAmountStr, remainingAmount, cashAmount, changeAmount, processedPaymentItem;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               // 检查是否是现金支付
               cashPayment = isCashPayment(paymentItem.code, paymentItem.type);
               if (cashPayment) {
-                _context27.next = 3;
+                _context28.next = 3;
                 break;
               }
-              return _context27.abrupt("return", paymentItem);
+              return _context28.abrupt("return", paymentItem);
             case 3:
-              _context27.prev = 3;
-              _context27.next = 6;
+              _context28.prev = 3;
+              _context28.next = 6;
               return this.calculateRemainingAmountAsync();
             case 6:
-              remainingAmountStr = _context27.sent;
+              remainingAmountStr = _context28.sent;
               remainingAmount = new Decimal(remainingAmountStr);
               cashAmount = new Decimal(String(paymentItem.amount)); // 如果现金金额小于等于剩余待付金额，无需找零
               if (!cashAmount.lte(remainingAmount)) {
-                _context27.next = 11;
+                _context28.next = 11;
                 break;
               }
-              return _context27.abrupt("return", paymentItem);
+              return _context28.abrupt("return", paymentItem);
             case 11:
               // 使用 Decimal.js 安全计算找零金额
               changeAmount = cashAmount.sub(remainingAmount); // 如果还有 rounding_amount 的配置，要判断是否和 changeAmount 相等
               if (!(Number(paymentItem.rounding_amount) > 0)) {
-                _context27.next = 18;
+                _context28.next = 18;
                 break;
               }
               if (!(Number(paymentItem.rounding_amount) === changeAmount.toNumber())) {
-                _context27.next = 17;
+                _context28.next = 17;
                 break;
               }
-              return _context27.abrupt("return", paymentItem);
+              return _context28.abrupt("return", paymentItem);
             case 17:
               // 如果不等于，则remainingAmount需要加上 rounding_amount，避免这里被改为未舍入金额
               remainingAmount = remainingAmount.add(new Decimal(paymentItem.rounding_amount || '0'));
@@ -2244,20 +2492,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   changeAmountPrecise: changeAmount.toString()
                 }
               });
-              return _context27.abrupt("return", processedPaymentItem);
+              return _context28.abrupt("return", processedPaymentItem);
             case 23:
-              _context27.prev = 23;
-              _context27.t0 = _context27["catch"](3);
-              this.logError('处理现金支付项时出错:', _context27.t0);
+              _context28.prev = 23;
+              _context28.t0 = _context28["catch"](3);
+              this.logError('处理现金支付项时出错:', _context28.t0);
               // 出错时返回原始支付项，避免中断支付流程
-              return _context27.abrupt("return", paymentItem);
+              return _context28.abrupt("return", paymentItem);
             case 27:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee27, this, [[3, 23]]);
+        }, _callee28, this, [[3, 23]]);
       }));
-      function processCashPaymentItem(_x25) {
+      function processCashPaymentItem(_x26) {
         return _processCashPaymentItem.apply(this, arguments);
       }
       return processCashPaymentItem;
@@ -2269,31 +2517,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "preloadPaymentMethods",
     value: (function () {
-      var _preloadPaymentMethods = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28() {
+      var _preloadPaymentMethods = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
         var methods;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              _context28.prev = 0;
+              _context29.prev = 0;
               console.log('[Checkout] 预加载支付方式...');
-              _context28.next = 4;
+              _context29.next = 4;
               return this.payment.getPayMethodListAsync();
             case 4:
-              methods = _context28.sent;
+              methods = _context29.sent;
               this.store.paymentMethods = methods;
               console.log("[Checkout] \u9884\u52A0\u8F7D\u5B8C\u6210\uFF0C\u5171 ".concat(methods.length, " \u79CD\u652F\u4ED8\u65B9\u5F0F"));
-              _context28.next = 13;
+              _context29.next = 13;
               break;
             case 9:
-              _context28.prev = 9;
-              _context28.t0 = _context28["catch"](0);
-              console.error('[Checkout] 预加载支付方式失败:', _context28.t0);
+              _context29.prev = 9;
+              _context29.t0 = _context29["catch"](0);
+              console.error('[Checkout] 预加载支付方式失败:', _context29.t0);
               this.store.paymentMethods = [];
             case 13:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee28, this, [[0, 9]]);
+        }, _callee29, this, [[0, 9]]);
       }));
       function preloadPaymentMethods() {
         return _preloadPaymentMethods.apply(this, arguments);
@@ -2309,59 +2557,59 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cleanupExpiredOrdersAsync",
     value: (function () {
-      var _cleanupExpiredOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
+      var _cleanupExpiredOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
         var cleanupConfig, isCleanupEnabled, retentionDays, maxOrdersToDelete, allOrders, thresholdDate, deletedCount, ordersToDelete, _iterator, _step, order, _order$order_info, _order$order_info2, isSynced, orderCreatedAt, actualOrdersToDelete, _iterator2, _step2, orderInfo, summary, errorMessage;
-        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
-              _context29.prev = 0;
+              _context30.prev = 0;
               // 检查是否启用了清理功能
               cleanupConfig = this.otherParams.orderDataCleanup || {};
               isCleanupEnabled = cleanupConfig.enabled !== false; // 默认启用
               retentionDays = cleanupConfig.retentionDays || 7; // 默认保留7天
               maxOrdersToDelete = cleanupConfig.maxOrdersToDelete || 100; // 默认最多删除100个订单
               if (isCleanupEnabled) {
-                _context29.next = 8;
+                _context30.next = 8;
                 break;
               }
               console.log('[Checkout] 订单数据清理功能已禁用');
-              return _context29.abrupt("return");
+              return _context30.abrupt("return");
             case 8:
               console.log("[Checkout] \u5F00\u59CB\u6E05\u7406\u8FC7\u671F\u8BA2\u5355\u6570\u636E\uFF08\u4FDD\u7559 ".concat(retentionDays, " \u5929\u5185\u7684\u6570\u636E\uFF09..."));
 
               // 获取所有订单
-              _context29.next = 11;
+              _context30.next = 11;
               return this.payment.getOrderListAsync();
             case 11:
-              allOrders = _context29.sent;
+              allOrders = _context30.sent;
               if (!(!allOrders || allOrders.length === 0)) {
-                _context29.next = 15;
+                _context30.next = 15;
                 break;
               }
               console.log('[Checkout] 没有找到需要清理的订单数据');
-              return _context29.abrupt("return");
+              return _context30.abrupt("return");
             case 15:
               thresholdDate = new Date();
               thresholdDate.setDate(thresholdDate.getDate() - retentionDays);
               deletedCount = 0;
               ordersToDelete = [];
               _iterator = _createForOfIteratorHelper(allOrders);
-              _context29.prev = 20;
+              _context30.prev = 20;
               _iterator.s();
             case 22:
               if ((_step = _iterator.n()).done) {
-                _context29.next = 41;
+                _context30.next = 41;
                 break;
               }
               order = _step.value;
-              _context29.prev = 24;
+              _context30.prev = 24;
               // 检查订单是否已同步（订单ID不是虚拟ID）
               isSynced = order.order_id && !isVirtualOrderId(order.order_id);
               if (isSynced) {
-                _context29.next = 28;
+                _context30.next = 28;
                 break;
               }
-              return _context29.abrupt("continue", 39);
+              return _context30.abrupt("continue", 39);
             case 28:
               // 检查创建时间
               orderCreatedAt = null; // 尝试从 order_info.created_at 获取创建时间
@@ -2375,10 +2623,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 如果无法获取创建时间，跳过此订单
               if (!(!orderCreatedAt || isNaN(orderCreatedAt.getTime()))) {
-                _context29.next = 32;
+                _context30.next = 32;
                 break;
               }
-              return _context29.abrupt("continue", 39);
+              return _context30.abrupt("continue", 39);
             case 32:
               // 检查是否超过指定天数
               if (orderCreatedAt < thresholdDate) {
@@ -2389,27 +2637,27 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   daysSinceCreated: Math.floor((Date.now() - orderCreatedAt.getTime()) / (1000 * 60 * 60 * 24))
                 });
               }
-              _context29.next = 39;
+              _context30.next = 39;
               break;
             case 35:
-              _context29.prev = 35;
-              _context29.t0 = _context29["catch"](24);
-              console.warn("[Checkout] \u5904\u7406\u8BA2\u5355 ".concat(order.uuid, " \u65F6\u51FA\u9519:"), _context29.t0);
-              return _context29.abrupt("continue", 39);
+              _context30.prev = 35;
+              _context30.t0 = _context30["catch"](24);
+              console.warn("[Checkout] \u5904\u7406\u8BA2\u5355 ".concat(order.uuid, " \u65F6\u51FA\u9519:"), _context30.t0);
+              return _context30.abrupt("continue", 39);
             case 39:
-              _context29.next = 22;
+              _context30.next = 22;
               break;
             case 41:
-              _context29.next = 46;
+              _context30.next = 46;
               break;
             case 43:
-              _context29.prev = 43;
-              _context29.t1 = _context29["catch"](20);
-              _iterator.e(_context29.t1);
+              _context30.prev = 43;
+              _context30.t1 = _context30["catch"](20);
+              _iterator.e(_context30.t1);
             case 46:
-              _context29.prev = 46;
+              _context30.prev = 46;
               _iterator.f();
-              return _context29.finish(46);
+              return _context30.finish(46);
             case 49:
               // 按创建时间排序（最老的先删除）并限制删除数量
               ordersToDelete.sort(function (a, b) {
@@ -2417,40 +2665,40 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
               actualOrdersToDelete = ordersToDelete.slice(0, maxOrdersToDelete); // 删除符合条件的订单
               _iterator2 = _createForOfIteratorHelper(actualOrdersToDelete);
-              _context29.prev = 52;
+              _context30.prev = 52;
               _iterator2.s();
             case 54:
               if ((_step2 = _iterator2.n()).done) {
-                _context29.next = 68;
+                _context30.next = 68;
                 break;
               }
               orderInfo = _step2.value;
-              _context29.prev = 56;
-              _context29.next = 59;
+              _context30.prev = 56;
+              _context30.next = 59;
               return this.payment.deletePaymentOrderAsync(orderInfo.uuid);
             case 59:
               deletedCount++;
               console.log("[Checkout] \u5DF2\u5220\u9664\u8FC7\u671F\u8BA2\u5355: ".concat(orderInfo.orderId, " (").concat(orderInfo.daysSinceCreated, " \u5929\u524D\u521B\u5EFA)"));
-              _context29.next = 66;
+              _context30.next = 66;
               break;
             case 63:
-              _context29.prev = 63;
-              _context29.t2 = _context29["catch"](56);
-              console.error("[Checkout] \u5220\u9664\u8BA2\u5355 ".concat(orderInfo.uuid, " \u5931\u8D25:"), _context29.t2);
+              _context30.prev = 63;
+              _context30.t2 = _context30["catch"](56);
+              console.error("[Checkout] \u5220\u9664\u8BA2\u5355 ".concat(orderInfo.uuid, " \u5931\u8D25:"), _context30.t2);
             case 66:
-              _context29.next = 54;
+              _context30.next = 54;
               break;
             case 68:
-              _context29.next = 73;
+              _context30.next = 73;
               break;
             case 70:
-              _context29.prev = 70;
-              _context29.t3 = _context29["catch"](52);
-              _iterator2.e(_context29.t3);
+              _context30.prev = 70;
+              _context30.t3 = _context30["catch"](52);
+              _iterator2.e(_context30.t3);
             case 73:
-              _context29.prev = 73;
+              _context30.prev = 73;
               _iterator2.f();
-              return _context29.finish(73);
+              return _context30.finish(73);
             case 76:
               summary = {
                 totalOrders: allOrders.length,
@@ -2468,21 +2716,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               } else {
                 console.log("[Checkout] \u8FC7\u671F\u8BA2\u5355\u6E05\u7406\u5B8C\u6210: \u603B\u8BA1 ".concat(allOrders.length, " \u4E2A\u8BA2\u5355\uFF0C\u5220\u9664\u4E86 ").concat(deletedCount, " \u4E2A\u8FC7\u671F\u5DF2\u540C\u6B65\u8BA2\u5355"));
               }
-              _context29.next = 86;
+              _context30.next = 86;
               break;
             case 81:
-              _context29.prev = 81;
-              _context29.t4 = _context29["catch"](0);
-              errorMessage = _context29.t4 instanceof Error ? _context29.t4.message : String(_context29.t4);
-              console.error('[Checkout] 清理过期订单数据失败:', _context29.t4);
+              _context30.prev = 81;
+              _context30.t4 = _context30["catch"](0);
+              errorMessage = _context30.t4 instanceof Error ? _context30.t4.message : String(_context30.t4);
+              console.error('[Checkout] 清理过期订单数据失败:', _context30.t4);
               this.logError('Expired orders cleanup failed', {
                 error: errorMessage
               });
             case 86:
             case "end":
-              return _context29.stop();
+              return _context30.stop();
           }
-        }, _callee29, this, [[0, 81], [20, 43, 46, 49], [24, 35], [52, 70, 73, 76], [56, 63]]);
+        }, _callee30, this, [[0, 81], [20, 43, 46, 49], [24, 35], [52, 70, 73, 76], [56, 63]]);
       }));
       function cleanupExpiredOrdersAsync() {
         return _cleanupExpiredOrdersAsync.apply(this, arguments);
@@ -2496,24 +2744,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculatePaidAmountAsync",
     value: (function () {
-      var _calculatePaidAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
+      var _calculatePaidAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
         var payments, paidAmount, result;
-        return _regeneratorRuntime().wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               if (this.store.currentOrder) {
-                _context30.next = 3;
+                _context31.next = 3;
                 break;
               }
               this.logWarning('[Checkout] calculatePaidAmountAsync: 没有当前订单');
-              return _context30.abrupt("return", '0.00');
+              return _context31.abrupt("return", '0.00');
             case 3:
-              _context30.prev = 3;
-              _context30.next = 6;
+              _context31.prev = 3;
+              _context31.next = 6;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid, false // 不包括已撤销的支付项
               );
             case 6:
-              payments = _context30.sent;
+              payments = _context31.sent;
               // 使用 Decimal.js 进行安全的金额计算
               paidAmount = payments.filter(function (payment) {
                 return payment.status !== 'voided';
@@ -2542,17 +2790,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, new Decimal(0));
               result = paidAmount.toFixed(2);
               this.logInfo('calculatePaidAmountAsync: 计算结果 =', result);
-              return _context30.abrupt("return", result);
+              return _context31.abrupt("return", result);
             case 13:
-              _context30.prev = 13;
-              _context30.t0 = _context30["catch"](3);
-              this.logError('calculatePaidAmountAsync 失败:', _context30.t0);
-              return _context30.abrupt("return", '0.00');
+              _context31.prev = 13;
+              _context31.t0 = _context31["catch"](3);
+              this.logError('calculatePaidAmountAsync 失败:', _context31.t0);
+              return _context31.abrupt("return", '0.00');
             case 17:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee30, this, [[3, 13]]);
+        }, _callee31, this, [[3, 13]]);
       }));
       function calculatePaidAmountAsync() {
         return _calculatePaidAmountAsync.apply(this, arguments);
@@ -2566,34 +2814,41 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calculateRemainingAmountAsync",
     value: (function () {
-      var _calculateRemainingAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
-        var totalAmount, paidAmountStr, paidAmount, remainingAmount, result;
-        return _regeneratorRuntime().wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+      var _calculateRemainingAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
+        var totalAmount, currentOrder, paidAmountStr, paidAmount, remainingAmount, result;
+        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               if (this.store.currentOrder) {
-                _context31.next = 3;
+                _context32.next = 3;
                 break;
               }
               this.logWarning('calculateRemainingAmountAsync: 没有当前订单');
-              return _context31.abrupt("return", '0.00');
+              return _context32.abrupt("return", '0.00');
             case 3:
               // 使用 Decimal.js 进行安全的金额计算
               totalAmount = new Decimal(this.store.currentOrder.total_amount || '0');
-              _context31.next = 6;
-              return this.calculatePaidAmountAsync();
+              _context32.next = 6;
+              return this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
             case 6:
-              paidAmountStr = _context31.sent;
+              currentOrder = _context32.sent;
+              if (currentOrder !== null && currentOrder !== void 0 && currentOrder.is_deposit && currentOrder !== null && currentOrder !== void 0 && currentOrder.deposit_amount && Number(currentOrder === null || currentOrder === void 0 ? void 0 : currentOrder.deposit_amount) > 0) {
+                totalAmount = new Decimal(currentOrder === null || currentOrder === void 0 ? void 0 : currentOrder.deposit_amount);
+              }
+              _context32.next = 10;
+              return this.calculatePaidAmountAsync();
+            case 10:
+              paidAmountStr = _context32.sent;
               paidAmount = new Decimal(paidAmountStr);
               remainingAmount = totalAmount.sub(paidAmount); // 确保剩余金额不为负数
               result = Decimal.max(0, remainingAmount).toFixed(2);
               this.logInfo('calculateRemainingAmountAsync: 计算=', result);
-              return _context31.abrupt("return", result);
-            case 12:
+              return _context32.abrupt("return", result);
+            case 16:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
       function calculateRemainingAmountAsync() {
         return _calculateRemainingAmountAsync.apply(this, arguments);
@@ -2607,25 +2862,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateBalanceDueAmount",
     value: (function () {
-      var _updateBalanceDueAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
+      var _updateBalanceDueAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
         var remainingAmount, currentBalanceDueAmount;
-        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
-              _context32.prev = 0;
-              _context32.next = 3;
+              _context33.prev = 0;
+              _context33.next = 3;
               return this.calculateRemainingAmountAsync();
             case 3:
-              remainingAmount = _context32.sent;
+              remainingAmount = _context33.sent;
               currentBalanceDueAmount = this.store.balanceDueAmount; // 只有当剩余金额与当前 balanceDueAmount 不同时才更新
               if (!(remainingAmount !== currentBalanceDueAmount)) {
-                _context32.next = 12;
+                _context33.next = 12;
                 break;
               }
               this.store.balanceDueAmount = remainingAmount;
 
               // 发出 balanceDueAmount 变更事件
-              _context32.next = 9;
+              _context33.next = 9;
               return this.core.effects.emit(CheckoutHooks.OnBalanceDueAmountChanged, {
                 oldAmount: currentBalanceDueAmount,
                 newAmount: remainingAmount,
@@ -2636,7 +2891,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldAmount: currentBalanceDueAmount,
                 newAmount: remainingAmount
               });
-              _context32.next = 13;
+              _context33.next = 13;
               break;
             case 12:
               this.logInfo('balanceDueAmount 无需更新，当前值已是最新:', {
@@ -2644,17 +2899,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 remainingAmount: remainingAmount
               });
             case 13:
-              _context32.next = 18;
+              _context33.next = 18;
               break;
             case 15:
-              _context32.prev = 15;
-              _context32.t0 = _context32["catch"](0);
-              this.logError('更新 balanceDueAmount 失败:', _context32.t0);
+              _context33.prev = 15;
+              _context33.t0 = _context33["catch"](0);
+              this.logError('更新 balanceDueAmount 失败:', _context33.t0);
             case 18:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee32, this, [[0, 15]]);
+        }, _callee33, this, [[0, 15]]);
       }));
       function updateBalanceDueAmount() {
         return _updateBalanceDueAmount.apply(this, arguments);
@@ -2668,16 +2923,57 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "updateStateAmountToRemaining",
     value: (function () {
-      var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var remainingAmount, currentStateAmount;
-        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+      var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
+        var checkOrder,
+          _this$store$currentOr23,
+          _this$store$currentOr24,
+          _this$store$currentOr25,
+          paymentItems,
+          depositPaidAmount,
+          _this$store$currentOr26,
+          remainingAmount,
+          currentStateAmount,
+          _args34 = arguments;
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              _context33.prev = 0;
-              _context33.next = 3;
+              checkOrder = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : true;
+              _context34.prev = 1;
+              if (!(((_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.is_deposit) === 1)) {
+                _context34.next = 11;
+                break;
+              }
+              _context34.next = 5;
+              return this.payment.getPaymentItemsAsync((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.uuid);
+            case 5:
+              paymentItems = _context34.sent;
+              depositPaidAmount = paymentItems.filter(function (item) {
+                return item.order_payment_type === 'deposit' && item.status !== 'voided';
+              }).reduce(function (sum, item) {
+                // 如果是 wallet，并且还没同步到后端，则不计入这一部分金额
+                if (item.voucher_id && !item.isSynced) {
+                  return sum;
+                }
+                var amount = new Decimal(item.amount || '0');
+                var roundingAmount = new Decimal(item.rounding_amount || '0');
+                return sum.add(amount.add(roundingAmount.abs()));
+              }, new Decimal(0));
+              if (!depositPaidAmount.gte((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.deposit_amount)) {
+                _context34.next = 11;
+                break;
+              }
+              this.store.currentOrder = _objectSpread(_objectSpread({}, this.store.currentOrder), {}, {
+                is_deposit: 0
+              });
+              _context34.next = 11;
+              return this.payment.updateOrderAsync((_this$store$currentOr26 = this.store.currentOrder) === null || _this$store$currentOr26 === void 0 ? void 0 : _this$store$currentOr26.uuid, {
+                is_deposit: 0
+              });
+            case 11:
+              _context34.next = 13;
               return this.calculateRemainingAmountAsync();
-            case 3:
-              remainingAmount = _context33.sent;
+            case 13:
+              remainingAmount = _context34.sent;
               currentStateAmount = this.store.stateAmount; // 只有当剩余金额与当前 stateAmount 不同时才更新
               if (remainingAmount !== currentStateAmount) {
                 this.store.stateAmount = remainingAmount;
@@ -2698,25 +2994,33 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   remainingAmount: remainingAmount
                 });
               }
-
               // 同步更新系统内部的 balanceDueAmount
-              _context33.next = 8;
+              _context34.next = 18;
               return this.updateBalanceDueAmount();
-            case 8:
-              _context33.next = 10;
+            case 18:
+              if (!checkOrder) {
+                _context34.next = 23;
+                break;
+              }
+              _context34.next = 21;
               return this.checkOrderPaymentCompletion();
-            case 10:
-              _context33.next = 15;
+            case 21:
+              _context34.next = 24;
               break;
-            case 12:
-              _context33.prev = 12;
-              _context33.t0 = _context33["catch"](0);
-              this.logError('更新 stateAmount 为剩余金额失败:', _context33.t0);
-            case 15:
+            case 23:
+              this.logInfo('外部传入无需 checkOrder，不执行订单支付完成检测和同步');
+            case 24:
+              _context34.next = 29;
+              break;
+            case 26:
+              _context34.prev = 26;
+              _context34.t0 = _context34["catch"](1);
+              this.logError('更新 stateAmount 为剩余金额失败:', _context34.t0);
+            case 29:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee33, this, [[0, 12]]);
+        }, _callee34, this, [[1, 26]]);
       }));
       function updateStateAmountToRemaining() {
         return _updateStateAmountToRemaining.apply(this, arguments);
@@ -2732,32 +3036,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "checkOrderPaymentCompletion",
     value: (function () {
-      var _checkOrderPaymentCompletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
+      var _checkOrderPaymentCompletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
         var remainingAmount, remainingValue, totalAmount, paidAmount, currentPayments, hasPaymentItems, allPaymentsHaveVoucherId, shouldAutoSync;
-        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
-              _context34.prev = 0;
+              _context35.prev = 0;
               if (this.store.currentOrder) {
-                _context34.next = 3;
+                _context35.next = 3;
                 break;
               }
-              return _context34.abrupt("return");
+              return _context35.abrupt("return");
             case 3:
-              _context34.next = 5;
+              _context35.next = 5;
               return this.calculateRemainingAmountAsync();
             case 5:
-              remainingAmount = _context34.sent;
+              remainingAmount = _context35.sent;
               remainingValue = new Decimal(remainingAmount); // 当剩余金额小于等于0时，认为订单已完成支付
               if (!remainingValue.lte(0)) {
-                _context34.next = 29;
+                _context35.next = 29;
                 break;
               }
               totalAmount = this.store.currentOrder.total_amount;
-              _context34.next = 11;
+              _context35.next = 11;
               return this.calculatePaidAmountAsync();
             case 11:
-              paidAmount = _context34.sent;
+              paidAmount = _context35.sent;
               this.logInfo('检测到订单支付完成:', {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -2768,11 +3072,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 从 Payment 模块获取最新支付项，检查自动同步条件
-              _context34.next = 15;
+              _context35.next = 15;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid, false // 不包括已撤销的支付项
               );
             case 15:
-              currentPayments = _context34.sent;
+              currentPayments = _context35.sent;
               // 检查自动同步条件：
               // 1. 待付金额为 0 ✓ (已在上面检查)
               // 2. 需要有支付项
@@ -2806,14 +3110,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 })
               });
               if (!shouldAutoSync) {
-                _context34.next = 26;
+                _context35.next = 26;
                 break;
               }
               this.logInfo('满足自动同步条件，开始同步订单到后端...');
-              _context34.next = 24;
+              _context35.next = 24;
               return this.syncOrderToBackendWithReturn(false);
             case 24:
-              _context34.next = 27;
+              _context35.next = 27;
               break;
             case 26:
               if (!hasPaymentItems) {
@@ -2822,7 +3126,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.logInfo('所有支付项均为代金券类型，跳过订单同步');
               }
             case 27:
-              _context34.next = 29;
+              _context35.next = 29;
               return this.core.effects.emit(CheckoutHooks.OnOrderPaymentCompleted, {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -2832,17 +3136,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 29:
-              _context34.next = 34;
+              _context35.next = 34;
               break;
             case 31:
-              _context34.prev = 31;
-              _context34.t0 = _context34["catch"](0);
-              this.logError('检查订单支付完成状态失败:', _context34.t0);
+              _context35.prev = 31;
+              _context35.t0 = _context35["catch"](0);
+              this.logError('检查订单支付完成状态失败:', _context35.t0);
             case 34:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee34, this, [[0, 31]]);
+        }, _callee35, this, [[0, 31]]);
       }));
       function checkOrderPaymentCompletion() {
         return _checkOrderPaymentCompletion.apply(this, arguments);
@@ -2860,12 +3164,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
-      var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
+      var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
         var _this4 = this,
-          _this$store$currentOr19,
-          _this$store$currentOr20,
+          _this$store$currentOr27,
+          _this$store$currentOr28,
           _this$store$currentCu2,
-          _this$store$currentOr21,
+          _this$store$currentOr29,
+          _this$store$localOrde,
+          _this$store$localOrde2,
           _checkoutResponse3,
           _checkoutResponse4;
         var isManual,
@@ -2876,10 +3182,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           processedPaymentItems,
           finalDepositAmount,
           manualDepositAmount,
-          depositPaymentItems,
-          calculatedDepositAmount,
           manualDepositValue,
-          calculatedDepositValue,
           orderParams,
           startTime,
           checkoutResponse,
@@ -2897,14 +3200,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _checkoutResponse7,
           updatedOrder,
           beforeManualUpdate,
-          _args35 = arguments;
-        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+          syncedPaymentUuids,
+          _iterator3,
+          _step3,
+          paymentUuid,
+          _args36 = arguments;
+        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
-              isManual = _args35.length > 0 && _args35[0] !== undefined ? _args35[0] : false;
-              customPaymentItems = _args35.length > 1 ? _args35[1] : undefined;
+              isManual = _args36.length > 0 && _args36[0] !== undefined ? _args36[0] : false;
+              customPaymentItems = _args36.length > 1 ? _args36[1] : undefined;
               if (!(!this.store.localOrderData || !this.store.currentOrder)) {
-                _context35.next = 4;
+                _context36.next = 4;
                 break;
               }
               throw new Error('缺少必要的订单数据，无法同步到后端');
@@ -2923,17 +3230,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 获取当前订单的支付项
-              _context35.t0 = customPaymentItems;
-              if (_context35.t0) {
-                _context35.next = 13;
+              _context36.t0 = customPaymentItems;
+              if (_context36.t0) {
+                _context36.next = 13;
                 break;
               }
-              _context35.next = 12;
+              _context36.next = 12;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 12:
-              _context35.t0 = _context35.sent;
+              _context36.t0 = _context36.sent;
             case 13:
-              paymentItems = _context35.t0;
+              paymentItems = _context36.t0;
               // 处理支付项数据，确保包含完整的 metadata
               processedPaymentItems = paymentItems.map(function (item) {
                 var _item$metadata, _item$metadata2;
@@ -2944,47 +3251,26 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   })
                 });
               }); // 确定最终的定金金额：优先使用手动设置的值，否则从支付项中计算
-              manualDepositAmount = ((_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.deposit_amount) || '0.00'; // 计算定金支付项的总金额（order_payment_type="deposit"）
-              depositPaymentItems = processedPaymentItems.filter(function (item) {
-                return item.order_payment_type === 'deposit' && item.status !== 'voided';
-              });
-              calculatedDepositAmount = depositPaymentItems.reduce(function (sum, item) {
-                var amount = new Decimal(item.amount || '0');
-                var roundingAmount = new Decimal(item.rounding_amount || '0');
-                // 包含抹零计算的有效支付金额
-                var effectiveAmount = amount.add(roundingAmount.abs());
-                return sum.add(effectiveAmount);
-              }, new Decimal(0)).toFixed(2); // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
+              manualDepositAmount = ((_this$store$currentOr27 = this.store.currentOrder) === null || _this$store$currentOr27 === void 0 ? void 0 : _this$store$currentOr27.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
               manualDepositValue = new Decimal(manualDepositAmount);
-              calculatedDepositValue = new Decimal(calculatedDepositAmount);
               if (manualDepositValue.gt(0)) {
                 // 如果手动设置了定金金额且大于0，使用手动设置的值
                 finalDepositAmount = manualDepositAmount;
                 this.logInfo('使用手动设置的定金金额', {
                   manualDepositAmount: manualDepositAmount,
-                  calculatedDepositAmount: calculatedDepositAmount,
                   reason: '用户通过setDepositAmountAsync手动设置了定金金额'
                 });
-              } else if (calculatedDepositValue.gt(0)) {
-                // 如果没有手动设置但有定金类型的支付项，使用计算值
-                finalDepositAmount = calculatedDepositAmount;
-                this.logInfo('使用从支付项计算的定金金额', {
-                  manualDepositAmount: manualDepositAmount,
-                  calculatedDepositAmount: calculatedDepositAmount,
-                  reason: '未手动设置定金金额，从定金类型支付项计算得出'
-                });
               } else {
                 // 都为0，使用0
                 finalDepositAmount = '0.00';
                 this.logInfo('定金金额为0', {
                   manualDepositAmount: manualDepositAmount,
-                  calculatedDepositAmount: calculatedDepositAmount,
                   reason: '手动设置和计算值均为0'
                 });
               }
               this.logInfo('定金金额确定结果', {
-                depositPaymentItemsCount: depositPaymentItems.length,
-                depositPaymentItems: depositPaymentItems.map(function (item) {
+                depositPaymentItemsCount: processedPaymentItems.length,
+                depositPaymentItems: processedPaymentItems.map(function (item) {
                   return {
                     uuid: item.uuid,
                     code: item.code,
@@ -2995,9 +3281,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   };
                 }),
                 manualDepositAmount: manualDepositAmount,
-                calculatedDepositAmount: calculatedDepositAmount,
                 finalDepositAmount: finalDepositAmount,
-                isDeposit: ((_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.is_deposit) || 0
+                isDeposit: ((_this$store$currentOr28 = this.store.currentOrder) === null || _this$store$currentOr28 === void 0 ? void 0 : _this$store$currentOr28.is_deposit) || 0
               });
 
               // 构造订单参数，直接使用 localOrderData 中已处理好的数据
@@ -3019,11 +3304,25 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currency_code: this.otherParams.currency_code,
                 currency_symbol: this.otherParams.currency_symbol,
                 currency_format: this.otherParams.currency_format,
-                is_deposit: ((_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.is_deposit) || 0,
+                is_deposit: ((_this$store$currentOr29 = this.store.currentOrder) !== null && _this$store$currentOr29 !== void 0 && _this$store$currentOr29.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
+                note: this.store.localOrderData.shop_note,
+                bookings: (_this$store$localOrde = this.store.localOrderData.bookings) === null || _this$store$localOrde === void 0 ? void 0 : _this$store$localOrde.map(function (item) {
+                  return _objectSpread(_objectSpread({}, item), {}, {
+                    product: _objectSpread(_objectSpread({}, item.product), {}, {
+                      custom_deposit_data: undefined
+                    }),
+                    deposit: undefined
+                  });
+                }),
+                relation_products: (_this$store$localOrde2 = this.store.localOrderData.relation_products) === null || _this$store$localOrde2 === void 0 ? void 0 : _this$store$localOrde2.map(function (item) {
+                  return _objectSpread(_objectSpread({}, item), {}, {
+                    custom_deposit_data: undefined,
+                    deposit: undefined
+                  });
+                })
               }); // 如果是更新操作，需要在参数中包含真实的订单ID
               if (isUpdateOperation) {
                 // 如果当前订单ID是虚拟ID，但订单已同步过，可能存在数据不一致的问题
@@ -3036,7 +3335,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context35.next = 27;
+              _context36.next = 24;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3044,9 +3343,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 27:
+            case 24:
               submitSuccess = false;
-              _context35.prev = 28;
+              _context36.prev = 25;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -3054,23 +3353,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context35.next = 32;
+              _context36.next = 29;
               return this.order.createOrderByCheckout(orderParams);
-            case 32:
-              checkoutResponse = _context35.sent;
+            case 29:
+              checkoutResponse = _context36.sent;
               submitSuccess = true;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context35.next = 45;
+              _context36.next = 42;
               break;
-            case 37:
-              _context35.prev = 37;
-              _context35.t1 = _context35["catch"](28);
+            case 34:
+              _context36.prev = 34;
+              _context36.t1 = _context36["catch"](25);
               submitSuccess = false;
-              submitError = _context35.t1 instanceof Error ? _context35.t1.message : String(_context35.t1);
+              submitError = _context36.t1 instanceof Error ? _context36.t1.message : String(_context36.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context35.next = 44;
+              _context36.next = 41;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3080,11 +3379,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 44:
-              throw _context35.t1;
-            case 45:
-              _context35.prev = 45;
-              _context35.next = 48;
+            case 41:
+              throw _context36.t1;
+            case 42:
+              _context36.prev = 42;
+              _context36.next = 45;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -3095,18 +3394,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 48:
-              return _context35.finish(45);
-            case 49:
+            case 45:
+              return _context36.finish(42);
+            case 46:
               // 检查响应状态是否为成功状态
               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) {
-                _context35.next = 56;
+                _context36.next = 53;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context35.next = 55;
+              _context36.next = 52;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3117,18 +3416,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 55:
+            case 52:
               throw new Error(errorMessage);
-            case 56:
+            case 53:
               if (!isUpdateOperation) {
-                _context35.next = 60;
+                _context36.next = 57;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context35.next = 79;
+              _context36.next = 76;
               break;
-            case 60:
+            case 57:
               // 创建操作：从响应中提取新的订单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) {
@@ -3150,11 +3449,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context35.prev = 66;
-              _context35.next = 69;
+              _context36.prev = 63;
+              _context36.next = 66;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 69:
-              updatedOrder = _context35.sent;
+            case 66:
+              updatedOrder = _context36.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
                 returnedOrderId: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.order_id,
@@ -3180,22 +3479,66 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context35.next = 79;
+              _context36.next = 76;
               break;
-            case 74:
-              _context35.prev = 74;
-              _context35.t2 = _context35["catch"](66);
-              this.logError('调用Payment模块替换订单ID时发生错误:', _context35.t2);
+            case 71:
+              _context36.prev = 71;
+              _context36.t2 = _context36["catch"](63);
+              this.logError('调用Payment模块替换订单ID时发生错误:', _context36.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 79:
+            case 76:
+              _context36.prev = 76;
+              syncedPaymentUuids = processedPaymentItems.filter(function (item) {
+                return item.status !== 'voided';
+              }).map(function (item) {
+                return item.uuid;
+              }).filter(Boolean);
+              _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
+              _context36.prev = 79;
+              _iterator3.s();
+            case 81:
+              if ((_step3 = _iterator3.n()).done) {
+                _context36.next = 87;
+                break;
+              }
+              paymentUuid = _step3.value;
+              _context36.next = 85;
+              return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
+                isSynced: true,
+                syncError: undefined
+              });
+            case 85:
+              _context36.next = 81;
+              break;
+            case 87:
+              _context36.next = 92;
+              break;
+            case 89:
+              _context36.prev = 89;
+              _context36.t3 = _context36["catch"](79);
+              _iterator3.e(_context36.t3);
+            case 92:
+              _context36.prev = 92;
+              _iterator3.f();
+              return _context36.finish(92);
+            case 95:
+              _context36.next = 100;
+              break;
+            case 97:
+              _context36.prev = 97;
+              _context36.t4 = _context36["catch"](76);
+              this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
+                error: _context36.t4
+              });
+            case 100:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context35.next = 82;
+              _context36.next = 103;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -3204,18 +3547,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 82:
-              return _context35.abrupt("return", {
+            case 103:
+              return _context36.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 83:
+            case 104:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee35, this, [[28, 37, 45, 49], [66, 74]]);
+        }, _callee36, this, [[25, 34, 42, 46], [63, 71], [76, 97], [79, 89, 92, 95]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);
@@ -3225,15 +3568,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
         var _ref5,
           _ref5$cover,
           cover,
-          _args36 = arguments;
-        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+          _args37 = arguments;
+        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              _ref5 = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              _ref5 = _args37.length > 1 && _args37[1] !== undefined ? _args37[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3241,11 +3584,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee36, this);
+        }, _callee37, this);
       }));
-      function setOtherParams(_x26) {
+      function setOtherParams(_x27) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -3262,22 +3605,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "editOrderNoteByOrderIdAsync",
     value: (function () {
-      var _editOrderNoteByOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(orderId, note) {
+      var _editOrderNoteByOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(orderId, note) {
         var response, previousNote, errorMessage, _errorMessage;
-        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
               this.logInfo('editOrderNoteByOrderIdAsync called', {
                 orderId: orderId,
                 note: note,
                 noteLength: note.length
               });
-              _context37.prev = 1;
+              _context38.prev = 1;
               if (orderId) {
-                _context37.next = 4;
+                _context38.next = 4;
                 break;
               }
-              return _context37.abrupt("return", {
+              return _context38.abrupt("return", {
                 success: false,
                 message: '订单ID不能为空',
                 orderId: orderId
@@ -3293,12 +3636,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端API修改订单备注
-              _context37.next = 7;
+              _context38.next = 7;
               return this.request.put("/order/order/".concat(orderId, "/note"), {
                 note: note
               });
             case 7:
-              response = _context37.sent;
+              response = _context38.sent;
               this.logInfo('订单备注编辑响应:', {
                 orderId: orderId,
                 status: response.status,
@@ -3308,11 +3651,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 检查响应状态
               if (!(response.status === true || response.status === 200)) {
-                _context37.next = 18;
+                _context38.next = 18;
                 break;
               }
               if (!(this.store.currentOrder && (String(this.store.currentOrder.order_id) === String(orderId) || String(this.store.currentOrder.id) === String(orderId)))) {
-                _context37.next = 15;
+                _context38.next = 15;
                 break;
               }
               // 获取修改前的备注用于事件
@@ -3322,7 +3665,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 触发订单备注变更事件
-              _context37.next = 15;
+              _context38.next = 15;
               return this.core.effects.emit(CheckoutHooks.OnOrderNoteChanged, {
                 orderUuid: this.store.currentOrder.uuid,
                 oldNote: previousNote,
@@ -3330,7 +3673,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 timestamp: Date.now()
               });
             case 15:
-              return _context37.abrupt("return", {
+              return _context38.abrupt("return", {
                 success: true,
                 message: response.message || '订单备注修改成功',
                 orderId: orderId
@@ -3339,31 +3682,31 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // API返回失败状态
               errorMessage = response.message || '订单备注修改失败';
               this.logError("\u8BA2\u5355 ".concat(orderId, " \u5907\u6CE8\u4FEE\u6539\u5931\u8D25:"), errorMessage);
-              return _context37.abrupt("return", {
+              return _context38.abrupt("return", {
                 success: false,
                 message: errorMessage,
                 orderId: orderId
               });
             case 21:
-              _context37.next = 28;
+              _context38.next = 28;
               break;
             case 23:
-              _context37.prev = 23;
-              _context37.t0 = _context37["catch"](1);
-              this.logError('编辑订单备注失败:', _context37.t0);
-              _errorMessage = _context37.t0 instanceof Error ? _context37.t0.message : '网络错误或服务器异常';
-              return _context37.abrupt("return", {
+              _context38.prev = 23;
+              _context38.t0 = _context38["catch"](1);
+              this.logError('编辑订单备注失败:', _context38.t0);
+              _errorMessage = _context38.t0 instanceof Error ? _context38.t0.message : '网络错误或服务器异常';
+              return _context38.abrupt("return", {
                 success: false,
                 message: "\u7F16\u8F91\u8BA2\u5355\u5907\u6CE8\u5931\u8D25: ".concat(_errorMessage),
                 orderId: orderId
               });
             case 28:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee37, this, [[1, 23]]);
+        }, _callee38, this, [[1, 23]]);
       }));
-      function editOrderNoteByOrderIdAsync(_x27, _x28) {
+      function editOrderNoteByOrderIdAsync(_x28, _x29) {
         return _editOrderNoteByOrderIdAsync.apply(this, arguments);
       }
       return editOrderNoteByOrderIdAsync;
@@ -3380,11 +3723,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLinkAsync",
     value: (function () {
-      var _sendCustomerPayLinkAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee38(params) {
+      var _sendCustomerPayLinkAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(params) {
         var _params$order_ids, _params$emails;
         var emailRegex, invalidEmails, requestBody, response, errorMessage, _errorMessage2;
-        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
               this.logInfo('sendCustomerPayLinkAsync called', {
                 orderIds: params.order_ids,
@@ -3393,21 +3736,21 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 emailsCount: ((_params$emails = params.emails) === null || _params$emails === void 0 ? void 0 : _params$emails.length) || 0,
                 notifyAction: params.notify_action || 'order_payment_reminder'
               });
-              _context38.prev = 1;
+              _context39.prev = 1;
               if (!(!params.order_ids || params.order_ids.length === 0)) {
-                _context38.next = 4;
+                _context39.next = 4;
                 break;
               }
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: false,
                 message: '订单ID列表不能为空'
               });
             case 4:
               if (!(!params.emails || params.emails.length === 0)) {
-                _context38.next = 6;
+                _context39.next = 6;
                 break;
               }
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: false,
                 message: '邮箱地址列表不能为空'
               });
@@ -3418,10 +3761,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 return !emailRegex.test(email);
               });
               if (!(invalidEmails.length > 0)) {
-                _context38.next = 10;
+                _context39.next = 10;
                 break;
               }
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: false,
                 message: "\u90AE\u7BB1\u683C\u5F0F\u65E0\u6548: ".concat(invalidEmails.join(', '))
               });
@@ -3437,10 +3780,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, requestBody));
 
               // 调用后端API发送邮件
-              _context38.next = 14;
+              _context39.next = 14;
               return this.request.post('/order/batch-email', requestBody);
             case 14:
-              response = _context38.sent;
+              response = _context39.sent;
               this.logInfo('支付链接邮件发送响应:', {
                 status: response.status,
                 message: response.message,
@@ -3450,10 +3793,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 检查响应状态
               if (!(response.status === true || response.status === 200)) {
-                _context38.next = 20;
+                _context39.next = 20;
                 break;
               }
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: true,
                 message: response.message || '支付链接邮件发送成功'
               });
@@ -3461,29 +3804,29 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // API返回失败状态
               errorMessage = response.message || '支付链接邮件发送失败';
               console.error('[Checkout] 支付链接邮件发送失败:', errorMessage);
-              return _context38.abrupt("return", {
+              return _context39.abrupt("return", {
                 success: false,
                 message: errorMessage
               });
             case 23:
-              _context38.next = 30;
+              _context39.next = 30;
               break;
             case 25:
-              _context38.prev = 25;
-              _context38.t0 = _context38["catch"](1);
-              this.logError('发送客户支付链接邮件失败:', _context38.t0);
-              _errorMessage2 = _context38.t0 instanceof Error ? _context38.t0.message : '网络错误或服务器异常';
-              return _context38.abrupt("return", {
+              _context39.prev = 25;
+              _context39.t0 = _context39["catch"](1);
+              this.logError('发送客户支付链接邮件失败:', _context39.t0);
+              _errorMessage2 = _context39.t0 instanceof Error ? _context39.t0.message : '网络错误或服务器异常';
+              return _context39.abrupt("return", {
                 success: false,
                 message: "\u53D1\u9001\u652F\u4ED8\u94FE\u63A5\u90AE\u4EF6\u5931\u8D25: ".concat(_errorMessage2)
               });
             case 30:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee38, this, [[1, 25]]);
+        }, _callee39, this, [[1, 25]]);
       }));
-      function sendCustomerPayLinkAsync(_x29) {
+      function sendCustomerPayLinkAsync(_x30) {
         return _sendCustomerPayLinkAsync.apply(this, arguments);
       }
       return sendCustomerPayLinkAsync;
@@ -3498,24 +3841,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "roundAmountAsync",
     value: (function () {
-      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(amount) {
+      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(amount) {
         var _this$otherParams$ord, _this$otherParams$ord2;
         var result;
-        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
-          while (1) switch (_context39.prev = _context39.next) {
+        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
+          while (1) switch (_context40.prev = _context40.next) {
             case 0:
-              _context39.next = 2;
+              _context40.next = 2;
               return this.payment.roundAmountAsync(amount, (_this$otherParams$ord = this.otherParams.order_rounding_setting) === null || _this$otherParams$ord === void 0 ? void 0 : _this$otherParams$ord.interval, (_this$otherParams$ord2 = this.otherParams.order_rounding_setting) === null || _this$otherParams$ord2 === void 0 ? void 0 : _this$otherParams$ord2.type);
             case 2:
-              result = _context39.sent;
-              return _context39.abrupt("return", result);
+              result = _context40.sent;
+              return _context40.abrupt("return", result);
             case 4:
             case "end":
-              return _context39.stop();
+              return _context40.stop();
           }
-        }, _callee39, this);
+        }, _callee40, this);
       }));
-      function roundAmountAsync(_x30) {
+      function roundAmountAsync(_x31) {
         return _roundAmountAsync.apply(this, arguments);
       }
       return roundAmountAsync;
@@ -3523,10 +3866,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41() {
         var _this$order, _this$order$destroy, _this$payment, _this$payment$destroy;
-        return _regeneratorRuntime().wrap(function _callee40$(_context40) {
-          while (1) switch (_context40.prev = _context40.next) {
+        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
+          while (1) switch (_context41.prev = _context41.next) {
             case 0:
               // 清理钱包模块的所有缓存数据
               this.payment.wallet.clearAllCache();
@@ -3535,10 +3878,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.core.effects.offByModuleDestroy(this.name);
 
               // 销毁子模块
-              _context40.next = 4;
+              _context41.next = 4;
               return (_this$order = this.order) === null || _this$order === void 0 || (_this$order$destroy = _this$order.destroy) === null || _this$order$destroy === void 0 ? void 0 : _this$order$destroy.call(_this$order);
             case 4:
-              _context40.next = 6;
+              _context41.next = 6;
               return (_this$payment = this.payment) === null || _this$payment === void 0 || (_this$payment$destroy = _this$payment.destroy) === null || _this$payment$destroy === void 0 ? void 0 : _this$payment$destroy.call(_this$payment);
             case 6:
               // 取消注册模块
@@ -3546,9 +3889,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.log('[Checkout] 已销毁');
             case 8:
             case "end":
-              return _context40.stop();
+              return _context41.stop();
           }
-        }, _callee40, this);
+        }, _callee41, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -3563,12 +3906,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "resetStoreStateAsync",
     value: (function () {
-      var _resetStoreStateAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41() {
+      var _resetStoreStateAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42() {
         var prevOrderInfo;
-        return _regeneratorRuntime().wrap(function _callee41$(_context41) {
-          while (1) switch (_context41.prev = _context41.next) {
+        return _regeneratorRuntime().wrap(function _callee42$(_context42) {
+          while (1) switch (_context42.prev = _context42.next) {
             case 0:
-              _context41.prev = 0;
+              _context42.prev = 0;
               prevOrderInfo = this.store.currentOrder ? {
                 uuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id
@@ -3597,26 +3940,26 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 触发订单清理事件（如果之前有订单）
               if (!prevOrderInfo) {
-                _context41.next = 17;
+                _context42.next = 17;
                 break;
               }
-              _context41.next = 17;
+              _context42.next = 17;
               return this.core.effects.emit(CheckoutHooks.OnOrderCleared, {
                 previousOrder: prevOrderInfo,
                 timestamp: Date.now()
               });
             case 17:
-              _context41.next = 22;
+              _context42.next = 22;
               break;
             case 19:
-              _context41.prev = 19;
-              _context41.t0 = _context41["catch"](0);
-              console.error('[Checkout] 重置 store 状态失败:', _context41.t0);
+              _context42.prev = 19;
+              _context42.t0 = _context42["catch"](0);
+              console.error('[Checkout] 重置 store 状态失败:', _context42.t0);
             case 22:
             case "end":
-              return _context41.stop();
+              return _context42.stop();
           }
-        }, _callee41, this, [[0, 19]]);
+        }, _callee42, this, [[0, 19]]);
       }));
       function resetStoreStateAsync() {
         return _resetStoreStateAsync.apply(this, arguments);