@pisell/pisellos 0.0.236 → 0.0.238

package/dist/solution/Checkout/index.js

@@ -1,11 +1,11 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -313,7 +313,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProductListByOrder",
     value: function getProductListByOrder() {
-      var _this$store$currentOr;
+      var _this$store$currentOr, _this$store$currentOr2;
       if (!this.store.currentOrder) {
         return [];
       }
@@ -322,26 +322,34 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           return pre + (item.amount || 0);
         }, 0);
       };
-      var productList = (_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.original_order_data.bookings.map(function (item) {
+      var productList = ((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
         return {
           product_id: item.product.product_id,
           product_variant_id: item.product.product_variant_id,
           quantity: item.product.num,
           selling_price: item.product.price - (item.product.discount_amount || 0) - getDiscountListAmount(item.product.discount_list)
         };
-      });
-      return productList;
+      })) || [];
+      var relationProducts = ((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.relation_products) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.map(function (item) {
+        return {
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          selling_price: item.source_product_price
+        };
+      })) || [];
+      return [].concat(_toConsumableArray(productList), _toConsumableArray(relationProducts));
     }
   }, {
     key: "initWalletData",
     value: function () {
       var _initWalletData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$store$currentOr2, _this$store$currentCu;
+        var _this$store$currentOr3, _this$store$currentCu;
         var amountInfo, walletBusinessData;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              amountInfo = (_this$store$currentOr2 = this.store.currentOrder) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.order_info) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.amount_breakdown;
+              amountInfo = (_this$store$currentOr3 = this.store.currentOrder) === null || _this$store$currentOr3 === void 0 || (_this$store$currentOr3 = _this$store$currentOr3.order_info) === null || _this$store$currentOr3 === void 0 ? void 0 : _this$store$currentOr3.amount_breakdown;
               if (amountInfo) {
                 _context8.next = 3;
                 break;
@@ -978,12 +986,12 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCheckoutSummaryAsync",
     value: (function () {
       var _getCheckoutSummaryAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        var _this$store$currentOr3, _this$store$currentOr4;
+        var _this$store$currentOr4, _this$store$currentOr5;
         var totalAmount, paidAmount, remainingAmount;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              totalAmount = ((_this$store$currentOr3 = this.store.currentOrder) === null || _this$store$currentOr3 === void 0 ? void 0 : _this$store$currentOr3.total_amount) || '0.00';
+              totalAmount = ((_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.total_amount) || '0.00';
               _context15.next = 3;
               return this.calculatePaidAmountAsync();
             case 3:
@@ -997,7 +1005,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 totalAmount: totalAmount,
                 paidAmount: paidAmount,
                 remainingAmount: remainingAmount,
-                paymentStatus: ((_this$store$currentOr4 = this.store.currentOrder) === null || _this$store$currentOr4 === void 0 ? void 0 : _this$store$currentOr4.payment_status) || PaymentStatus.Processing,
+                paymentStatus: ((_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.payment_status) || PaymentStatus.Processing,
                 availablePaymentMethods: this.store.paymentMethods
               });
             case 8:
@@ -1084,8 +1092,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$currentOr6;
+      return (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.order_info;
     }
 
     /**
@@ -1633,7 +1641,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(paymentItem) {
-        var currentOrderId, isCurrentOrderReal;
+        var _paymentItem$type, _paymentItem$code, isEftposPayment;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1661,89 +1669,63 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               console.log('[Checkout] 支付项添加成功');
 
-              // 重新从Payment模块获取最新的订单数据，确保支付项同步
-              currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
-              isCurrentOrderReal = currentOrderId && !this.isVirtualOrderId(currentOrderId);
-              console.log('[Checkout] 准备同步订单数据:', {
-                当前订单ID: currentOrderId,
-                是否为真实ID: isCurrentOrderReal
+              // 检查是否是 EFTPOS 支付，如果是则立即同步订单
+              isEftposPayment = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toLowerCase()) === 'eftpos' || ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase().includes('EFTPOS'));
+              console.log('[Checkout] EFTPOS 支付检查:', {
+                paymentCode: paymentItem.code,
+                paymentType: paymentItem.type,
+                isEftposPayment: isEftposPayment,
+                currentOrderSynced: this.store.isOrderSynced
               });
-
-              // const updatedOrder = await this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-              // if (updatedOrder) {
-              //   // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
-              //   if (isCurrentOrderReal && this.isVirtualOrderId(updatedOrder.order_id)) {
-              //     console.warn('[Checkout] 检测到订单ID回退，保护真实订单ID:', {
-              //       当前真实ID: currentOrderId,
-              //       获取到的虚拟ID: updatedOrder.order_id
-              //     });
-              //     updatedOrder.order_id = currentOrderId; // 恢复真实的订单ID
-              //   }
-
-              //   this.store.currentOrder = updatedOrder;
-              //   console.log('[Checkout] 订单数据已同步:', {
-              //     支付项数量: updatedOrder.payment.length,
-              //     最终订单ID: updatedOrder.order_id,
-              //     是否为虚拟ID: this.isVirtualOrderId(updatedOrder.order_id)
-              //   });
-              // }
-
-              // // 检查是否需要同步订单到后端
-              // const needsOrderSync = this.shouldSyncOrderForPayment(paymentItem.code, paymentItem.type);
-
-              // console.log('[Checkout] 支付项同步检查:', {
-              //   paymentCode: paymentItem.code,
-              //   paymentType: paymentItem.type,
-              //   paymentAmount: paymentItem.amount,
-              //   expectedCashCode: PaymentMethodType.Cash,
-              //   needsOrderSync,
-              //   isOrderSynced: this.store.isOrderSynced
-              // });
-
-              // if (needsOrderSync) {
-              //   console.log('[Checkout] 检测到非现金/自定义支付，开始同步订单到后端...', {
-              //     同步前订单ID: this.store.currentOrder.order_id,
-              //     是否为虚拟ID: this.isVirtualOrderId(this.store.currentOrder.order_id),
-              //     订单同步状态: this.store.isOrderSynced,
-              //     订单UUID: this.store.currentOrder.uuid
-              //   });
-
-              //   await this.syncOrderToBackend();
-
-              //   console.log('[Checkout] addPaymentItemAsync 中的同步完成:', {
-              //     同步后订单ID: this.store.currentOrder.order_id,
-              //     是否为虚拟ID: this.isVirtualOrderId(this.store.currentOrder.order_id),
-              //     订单同步状态: this.store.isOrderSynced
-              //   });
-              // }
-
-              // 支付项添加后，更新 stateAmount 为剩余未支付金额
-              _context25.next = 12;
-              return this.updateStateAmountToRemaining();
-            case 12:
+              if (!isEftposPayment) {
+                _context25.next = 22;
+                break;
+              }
+              console.log('[Checkout] 检测到 EFTPOS 支付，立即同步订单到后端...');
+              _context25.prev = 11;
               _context25.next = 14;
+              return this.syncOrderToBackendWithReturn(true);
+            case 14:
+              console.log('[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
+                订单ID: this.store.currentOrder.order_id,
+                是否已同步: this.store.isOrderSynced
+              });
+              _context25.next = 22;
+              break;
+            case 17:
+              _context25.prev = 17;
+              _context25.t0 = _context25["catch"](11);
+              console.error('[Checkout] EFTPOS 支付后订单同步失败:', _context25.t0);
+              // 不抛出错误，避免影响支付流程，但记录错误
+              _context25.next = 22;
+              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0))), CheckoutErrorType.OrderCreationFailed);
+            case 22:
+              _context25.next = 24;
+              return this.updateStateAmountToRemaining();
+            case 24:
+              _context25.next = 26;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 14:
-              _context25.next = 22;
+            case 26:
+              _context25.next = 34;
               break;
-            case 16:
-              _context25.prev = 16;
-              _context25.t0 = _context25["catch"](0);
-              console.error('[Checkout] 添加支付项失败:', _context25.t0);
-              _context25.next = 21;
-              return this.handleError(_context25.t0, CheckoutErrorType.PaymentFailed);
-            case 21:
-              throw _context25.t0;
-            case 22:
+            case 28:
+              _context25.prev = 28;
+              _context25.t1 = _context25["catch"](0);
+              console.error('[Checkout] 添加支付项失败:', _context25.t1);
+              _context25.next = 33;
+              return this.handleError(_context25.t1, CheckoutErrorType.PaymentFailed);
+            case 33:
+              throw _context25.t1;
+            case 34:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[0, 16]]);
+        }, _callee25, this, [[0, 28], [11, 17]]);
       }));
       function addPaymentItemAsync(_x16) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -2258,7 +2240,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "manualSyncOrderAsync",
     value: (function () {
       var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31() {
-        var orderUuid, oldOrderId, realOrderId, finalOrderId, finalIsVirtual, _this$store$currentOr6, errorMessage;
+        var orderUuid, oldOrderId, realOrderId, finalOrderId, finalIsVirtual, _this$store$currentOr7, errorMessage;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
@@ -2334,7 +2316,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context31.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.uuid
+                orderUuid: (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.uuid
               });
             case 32:
             case "end":
@@ -2411,15 +2393,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "cancelCurrentOrderAsync",
     value: (function () {
       var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(cancelReason) {
-        var _this$store$currentOr7, _this$store$currentOr8, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
+        var _this$store$currentOr8, _this$store$currentOr9, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
         return _regeneratorRuntime().wrap(function _callee32$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
               _context32.prev = 0;
               console.log('[Checkout] 开始取消当前本地订单:', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                orderUuid: (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.uuid,
-                orderId: (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.order_id,
+                orderUuid: (_this$store$currentOr8 = this.store.currentOrder) === null || _this$store$currentOr8 === void 0 ? void 0 : _this$store$currentOr8.uuid,
+                orderId: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_id,
                 isOrderSynced: this.store.isOrderSynced,
                 cancelReason: cancelReason
               });
@@ -2532,7 +2514,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveForLaterPaymentAsync",
     value: (function () {
       var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var orderUuid, currentOrderId, allPaymentItems, filteredPaymentItems, voucherItems, realOrderId, finalOrderId, _this$store$currentOr9, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, filteredPaymentItems, voucherItems, realOrderId, finalOrderId, _this$store$currentOr10, errorMessage;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
@@ -2561,10 +2543,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               allPaymentItems = _context33.sent;
               // 过滤掉带有 voucher_id 的支付项（代金券类支付项）
               filteredPaymentItems = allPaymentItems.filter(function (payment) {
-                return !payment.voucher_id || payment.voucher_id.trim() === '';
+                return !payment.voucher_id;
               }); // 记录过滤结果
               voucherItems = allPaymentItems.filter(function (payment) {
-                return payment.voucher_id && payment.voucher_id.trim() !== '';
+                return payment.voucher_id;
               });
               console.log('[Checkout] 支付项过滤结果:', {
                 总支付项: allPaymentItems.length,
@@ -2622,7 +2604,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context33.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.uuid
+                orderUuid: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.uuid
               });
             case 26:
             case "end":
@@ -2673,14 +2655,14 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateShopDiscountAsync",
     value: (function () {
       var _updateShopDiscountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(discountAmount) {
-        var _this$store$currentOr10, _this$store$currentOr11, oldDiscount, shopDiscountItem, updatedAmountInfo;
+        var _this$store$currentOr11, _this$store$currentOr12, oldDiscount, shopDiscountItem, updatedAmountInfo;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
               _context34.prev = 0;
               oldDiscount = this.getShopDiscount();
               console.log('[Checkout] 更新商店折扣:', {
-                orderUuid: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.uuid,
+                orderUuid: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.uuid,
                 oldDiscount: oldDiscount,
                 newDiscount: discountAmount
               });
@@ -2730,7 +2712,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 8:
               _context34.next = 10;
               return this.core.effects.emit(CheckoutHooks.OnShopDiscountChanged, {
-                orderUuid: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.uuid,
+                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
                 oldDiscount: oldDiscount,
                 newDiscount: discountAmount,
                 timestamp: Date.now()
@@ -2771,7 +2753,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderNoteAsync",
     value: (function () {
       var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(note) {
-        var _this$store$currentOr12, _this$store$currentOr13, oldNote, orderInPayment;
+        var _this$store$currentOr13, _this$store$currentOr14, oldNote, orderInPayment;
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
             case 0:
@@ -2783,7 +2765,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '没有本地订单数据，无法更新备注');
             case 3:
               console.log('[Checkout] 更新订单备注:', {
-                orderUuid: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.uuid,
+                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
                 oldNote: this.store.localOrderData.shop_note,
                 newNote: note
               });
@@ -2816,7 +2798,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 17:
               _context35.next = 19;
               return this.core.effects.emit(CheckoutHooks.OnOrderNoteChanged, {
-                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
+                orderUuid: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.uuid,
                 oldNote: oldNote,
                 newNote: note,
                 timestamp: Date.now()
@@ -2956,7 +2938,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentSuccess",
     value: (function () {
       var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(data) {
-        var _this$store$currentOr14;
+        var _this$store$currentOr15;
         return _regeneratorRuntime().wrap(function _callee39$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -2970,7 +2952,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit(CheckoutHooks.OnPaymentSuccess, {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.total_amount) || '0',
+                amount: ((_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 6:
@@ -2995,7 +2977,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentError",
     value: (function () {
       var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(data) {
-        var _this$store$currentOr15;
+        var _this$store$currentOr16;
         var error;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
@@ -3008,7 +2990,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit(CheckoutHooks.OnPaymentFailed, {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.total_amount) || '0',
+                amount: ((_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 5:
@@ -3354,7 +3336,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateStateAmountToRemaining",
     value: (function () {
       var _updateStateAmountToRemaining = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee46() {
-        var _this$store$currentOr16, remainingAmount, currentStateAmount;
+        var _this$store$currentOr17, remainingAmount, currentStateAmount;
         return _regeneratorRuntime().wrap(function _callee46$(_context46) {
           while (1) switch (_context46.prev = _context46.next) {
             case 0:
@@ -3368,7 +3350,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 calculatedRemainingAmount: remainingAmount,
                 currentStateAmount: currentStateAmount,
                 needsUpdate: remainingAmount !== currentStateAmount,
-                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid
+                orderUuid: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.uuid
               });
 
               // 只有当剩余金额与当前 stateAmount 不同时才更新
@@ -3428,7 +3410,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkOrderPaymentCompletion",
     value: (function () {
       var _checkOrderPaymentCompletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47() {
-        var remainingAmount, remainingValue, totalAmount, paidAmount, currentPayments, allPaymentsHaveVoucherId;
+        var remainingAmount, remainingValue, totalAmount, paidAmount, currentPayments, hasPaymentItems, allPaymentsHaveVoucherId, shouldAutoSync;
         return _regeneratorRuntime().wrap(function _callee47$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
             case 0:
@@ -3445,7 +3427,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               remainingAmount = _context47.sent;
               remainingValue = parseFloat(remainingAmount); // 当剩余金额小于等于0时，认为订单已完成支付
               if (!(remainingValue <= 0)) {
-                _context47.next = 27;
+                _context47.next = 29;
                 break;
               }
               totalAmount = this.store.currentOrder.total_amount;
@@ -3462,18 +3444,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isOrderSynced: this.store.isOrderSynced
               });
 
-              // 从 Payment 模块获取最新支付项，检查是否所有支付项都带有 voucher_id
+              // 从 Payment 模块获取最新支付项，检查自动同步条件
               _context47.next = 15;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid, false // 不包括已撤销的支付项
               );
             case 15:
               currentPayments = _context47.sent;
-              allPaymentsHaveVoucherId = currentPayments.length > 0 && currentPayments.every(function (item) {
+              // 检查自动同步条件：
+              // 1. 待付金额为 0 ✓ (已在上面检查)
+              // 2. 需要有支付项
+              // 3. 支付项不能全是带 voucher_id 的数据
+              hasPaymentItems = currentPayments.length > 0;
+              allPaymentsHaveVoucherId = hasPaymentItems && currentPayments.every(function (item) {
                 return item.status !== 'voided' && item.voucher_id;
-              });
-              console.log('[Checkout] 支付项voucher_id检查:', {
+              }); // 判断是否需要自动同步订单
+              // 条件：
+              // 1. 有支付项
+              // 2. 不全是代金券支付
+              // 3. 订单未同步 OR (订单已同步但支付刚完成，需要同步最终支付状态)
+              shouldAutoSync = hasPaymentItems && !allPaymentsHaveVoucherId;
+              console.log('[Checkout] 自动同步订单条件检查:', {
                 paymentCount: currentPayments.length,
+                hasPaymentItems: hasPaymentItems,
                 allHaveVoucherId: allPaymentsHaveVoucherId,
+                isOrderSynced: this.store.isOrderSynced,
+                shouldAutoSync: shouldAutoSync,
+                reason: shouldAutoSync ? '支付完成，需要同步最终支付状态' : '跳过同步',
                 paymentItems: currentPayments.map(function (p) {
                   return {
                     uuid: p.uuid,
@@ -3484,29 +3480,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   };
                 })
               });
-
-              // // 如果支付完成但订单未同步，需要判断是否同步
-              // if (!this.store.isOrderSynced) {
-              //   if (allPaymentsHaveVoucherId) {
-              //     console.log('[Checkout] 所有支付项均为代金券类型，跳过订单同步');
-              //   } else {
-              //   console.log('[Checkout] 支付完成但订单未同步，开始同步订单到后端...');
-              //   await this.syncOrderToBackend();
-              //   }
-              // }
-              if (!allPaymentsHaveVoucherId) {
-                _context47.next = 22;
+              if (!shouldAutoSync) {
+                _context47.next = 26;
                 break;
               }
-              console.log('[Checkout] 所有支付项均为代金券类型，跳过订单同步');
-              _context47.next = 25;
-              break;
-            case 22:
-              console.log('[Checkout] 支付完成但订单未同步，开始同步订单到后端...');
-              _context47.next = 25;
+              console.log('[Checkout] 满足自动同步条件，开始同步订单到后端...');
+              _context47.next = 24;
               return this.syncOrderToBackend();
-            case 25:
+            case 24:
               _context47.next = 27;
+              break;
+            case 26:
+              if (!hasPaymentItems) {
+                console.log('[Checkout] 没有支付项，跳过订单同步');
+              } else if (allPaymentsHaveVoucherId) {
+                console.log('[Checkout] 所有支付项均为代金券类型，跳过订单同步');
+              }
+            case 27:
+              _context47.next = 29;
               return this.core.effects.emit(CheckoutHooks.OnOrderPaymentCompleted, {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -3515,18 +3506,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 remainingAmount: remainingAmount,
                 timestamp: Date.now()
               });
-            case 27:
-              _context47.next = 32;
-              break;
             case 29:
-              _context47.prev = 29;
+              _context47.next = 34;
+              break;
+            case 31:
+              _context47.prev = 31;
               _context47.t0 = _context47["catch"](0);
               console.error('[Checkout] 检查订单支付完成状态失败:', _context47.t0);
-            case 32:
+            case 34:
             case "end":
               return _context47.stop();
           }
-        }, _callee47, this, [[0, 29]]);
+        }, _callee47, this, [[0, 31]]);
       }));
       function checkOrderPaymentCompletion() {
         return _checkOrderPaymentCompletion.apply(this, arguments);
@@ -3599,7 +3590,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee48() {
-        var _this$store$currentCu2, _this$store$currentOr17, _this$store$currentOr18;
+        var _this$store$currentCu2, _this$store$currentOr18, _this$store$currentOr19, _checkoutResponse3, _checkoutResponse4, _checkoutResponse5, _checkoutResponse6;
         var isManual,
           customPaymentItems,
           syncType,
@@ -3610,10 +3601,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           operation,
           paymentItems,
           orderParams,
+          startTime,
           checkoutResponse,
+          submitSuccess,
+          submitError,
+          _checkoutResponse,
+          _checkoutResponse2,
           realOrderId,
-          _data3,
+          _checkoutResponse7,
           extractedOrderId,
+          _checkoutResponse8,
           updatedOrder,
           beforeManualUpdate,
           finalOrderId,
@@ -3717,8 +3714,8 @@ 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$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.is_deposit) || 0,
-                deposit_amount: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.deposit_amount) || '0.00',
+                is_deposit: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.is_deposit) || 0,
+                deposit_amount: ((_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.deposit_amount) || '0.00',
                 // surcharge_fee: this.otherParams.surcharge_fee,
                 // surcharges: ,
                 note: this.store.localOrderData.shop_note
@@ -3747,31 +3744,70 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 console.log('[Checkout] 创建新订单操作');
               }
 
-              // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context48.next = 24;
+              // 发送下单接口请求开始事件
+              startTime = Date.now();
+              _context48.next = 25;
+              return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
+                orderUuid: this.store.currentOrder.uuid,
+                operation: isUpdateOperation ? 'update' : 'create',
+                isManual: isManual,
+                paymentItemCount: paymentItems.length,
+                timestamp: startTime
+              });
+            case 25:
+              submitSuccess = false;
+              _context48.prev = 26;
+              _context48.next = 29;
               return this.order.createOrderByCheckout(orderParams);
-            case 24:
+            case 29:
               checkoutResponse = _context48.sent;
+              submitSuccess = true;
+              console.log('[Checkout] 下单接口调用成功');
+              _context48.next = 40;
+              break;
+            case 34:
+              _context48.prev = 34;
+              _context48.t1 = _context48["catch"](26);
+              submitSuccess = false;
+              submitError = _context48.t1 instanceof Error ? _context48.t1.message : String(_context48.t1);
+              console.error('[Checkout] 下单接口调用失败:', submitError);
+              throw _context48.t1;
+            case 40:
+              _context48.prev = 40;
+              _context48.next = 43;
+              return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
+                success: submitSuccess,
+                orderUuid: this.store.currentOrder.uuid,
+                operation: isUpdateOperation ? 'update' : 'create',
+                isManual: isManual,
+                orderId: submitSuccess ? ((_checkoutResponse = checkoutResponse) === null || _checkoutResponse === void 0 || (_checkoutResponse = _checkoutResponse.data) === null || _checkoutResponse === void 0 ? void 0 : _checkoutResponse.order_id) || ((_checkoutResponse2 = checkoutResponse) === null || _checkoutResponse2 === void 0 ? void 0 : _checkoutResponse2.order_id) : undefined,
+                error: submitError,
+                duration: Date.now() - startTime,
+                timestamp: Date.now()
+              });
+            case 43:
+              return _context48.finish(40);
+            case 44:
               console.log('[Checkout] 后端返回的响应数据:', {
-                status: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.status,
-                code: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.code,
-                message: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.message,
-                data: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.data
+                status: (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status,
+                code: (_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code,
+                message: (_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message,
+                data: (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.data
               });
               if (!isUpdateOperation) {
-                _context48.next = 31;
+                _context48.next = 50;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
               console.log("[Checkout] \u8BA2\u5355\u66F4\u65B0\u6210\u529F\uFF0C\u8BA2\u5355ID: ".concat(realOrderId));
-              _context48.next = 52;
+              _context48.next = 71;
               break;
-            case 31:
+            case 50:
               // 创建操作：从响应中提取新的订单ID
-              extractedOrderId = checkoutResponse === null || checkoutResponse === void 0 || (_data3 = checkoutResponse.data) === null || _data3 === void 0 ? void 0 : _data3.order_id; // 如果data.order_id不存在，尝试直接从根级获取
+              extractedOrderId = (_checkoutResponse7 = checkoutResponse) === null || _checkoutResponse7 === void 0 || (_checkoutResponse7 = _checkoutResponse7.data) === null || _checkoutResponse7 === void 0 ? void 0 : _checkoutResponse7.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
-                extractedOrderId = checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.order_id;
+                extractedOrderId = (_checkoutResponse8 = checkoutResponse) === null || _checkoutResponse8 === void 0 ? void 0 : _checkoutResponse8.order_id;
               }
 
               // 确保转换为字符串类型
@@ -3779,11 +3815,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 extractedOrderId = String(extractedOrderId);
               }
               if (extractedOrderId) {
-                _context48.next = 36;
+                _context48.next = 55;
                 break;
               }
               throw new Error('后端返回的订单信息中未包含订单ID');
-            case 36:
+            case 55:
               realOrderId = extractedOrderId;
               console.log('[Checkout] 订单创建成功，真实订单ID:', realOrderId);
 
@@ -3793,10 +3829,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context48.prev = 39;
-              _context48.next = 42;
+              _context48.prev = 58;
+              _context48.next = 61;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 42:
+            case 61:
               updatedOrder = _context48.sent;
               console.log('[Checkout] Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -3823,22 +3859,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context48.next = 52;
+              _context48.next = 71;
               break;
-            case 47:
-              _context48.prev = 47;
-              _context48.t1 = _context48["catch"](39);
-              console.error('[Checkout] 调用Payment模块替换订单ID时发生错误:', _context48.t1);
+            case 66:
+              _context48.prev = 66;
+              _context48.t2 = _context48["catch"](58);
+              console.error('[Checkout] 调用Payment模块替换订单ID时发生错误:', _context48.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               console.log('[Checkout] 错误恢复：手动设置订单ID:', realOrderId);
-            case 52:
+            case 71:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context48.next = 55;
+              _context48.next = 74;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -3847,7 +3883,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 55:
+            case 74:
               // 验证最终状态
               finalOrderId = this.store.currentOrder.order_id;
               finalIsVirtual = this.isVirtualOrderId(finalOrderId || '');
@@ -3865,11 +3901,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 返回真实订单ID
               return _context48.abrupt("return", realOrderId);
-            case 60:
+            case 79:
             case "end":
               return _context48.stop();
           }
-        }, _callee48, this, [[39, 47]]);
+        }, _callee48, this, [[26, 34, 40, 44], [58, 66]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);
@@ -4297,17 +4333,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 清空购物车项目
               this.store.cartItems = [];
 
+              // 清理钱包缓存
+              this.payment.wallet.clearAllCache();
+
               // 注意：故意保留 this.store.paymentMethods，因为支付方式数据不易变更，保留在内存中提高性能
 
               // 重置状态和步骤为初始状态
-              _context55.next = 13;
+              _context55.next = 14;
               return this.setStatus(CheckoutStatus.Ready);
-            case 13:
-              _context55.next = 15;
+            case 14:
+              _context55.next = 16;
               return this.setStep(CheckoutStep.OrderConfirmation);
-            case 15:
-              // 清理钱包缓存
-              this.payment.wallet.clearAllCache();
+            case 16:
               console.log('[Checkout] Store 状态重置完成');
 
               // 触发订单清理事件（如果之前有订单）