@pisell/pisellos 0.0.236 → 0.0.238

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

@@ -393,7 +393,11 @@ export declare enum CheckoutHooks {
     /** 订单取消 */
     OnOrderCancelled = "checkout:onOrderCancelled",
     /** 订单状态已清理 */
-    OnOrderCleared = "checkout:onOrderCleared"
+    OnOrderCleared = "checkout:onOrderCleared",
+    /** 下单接口请求开始 */
+    OnOrderSubmitStart = "checkout:onOrderSubmitStart",
+    /** 下单接口请求完成 */
+    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd"
 }
 /**
  * 结账状态数据
@@ -824,4 +828,34 @@ export interface CheckoutEventData {
         } | null;
         timestamp: number;
     };
+    /** 下单接口请求开始事件 */
+    orderSubmitStart: {
+        /** 订单UUID */
+        orderUuid: string;
+        /** 操作类型 */
+        operation: 'create' | 'update';
+        /** 是否手动同步 */
+        isManual: boolean;
+        /** 支付项数量 */
+        paymentItemCount: number;
+        timestamp: number;
+    };
+    /** 下单接口请求完成事件 */
+    orderSubmitEnd: {
+        /** 是否成功 */
+        success: boolean;
+        /** 订单UUID */
+        orderUuid: string;
+        /** 操作类型 */
+        operation: 'create' | 'update';
+        /** 是否手动同步 */
+        isManual: boolean;
+        /** 返回的订单ID（成功时） */
+        orderId?: string;
+        /** 错误信息（失败时） */
+        error?: string;
+        /** 耗时（毫秒） */
+        duration?: number;
+        timestamp: number;
+    };
 }

package/dist/solution/Checkout/types.js

@@ -119,6 +119,8 @@ export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnShopDiscountChanged"] = "checkout:onShopDiscountChanged";
   CheckoutHooks["OnOrderCancelled"] = "checkout:onOrderCancelled";
   CheckoutHooks["OnOrderCleared"] = "checkout:onOrderCleared";
+  CheckoutHooks["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
+  CheckoutHooks["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   return CheckoutHooks;
 }({});
 

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

@@ -47,6 +47,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private setDiscountList;
     private getDiscountList;
     private getCustomerWallet;
+    private bestDiscount;
     private loadPrepareConfig;
 }
 export default ShopDiscountImpl;

package/dist/solution/ShopDiscount/index.js

@@ -50,7 +50,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       customer: null,
       productList: [],
       discount: null,
-      rules: null
+      rules: null,
+      originalDiscountList: []
     };
     return _this;
   }
@@ -360,26 +361,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 20;
+                _context5.next = 21;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
+              this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 20;
+                _context5.next = 21;
                 break;
               }
-              _context5.next = 20;
+              _context5.next = 21;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 20:
+            case 21:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 23:
-              _context5.prev = 23;
+            case 24:
+              _context5.prev = 24;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
@@ -388,11 +390,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 27:
+            case 28:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 23]]);
+        }, _callee5, this, [[0, 24]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
@@ -580,20 +582,52 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
-    }() // 加载准备配置
+    }()
   }, {
-    key: "loadPrepareConfig",
+    key: "bestDiscount",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        var _this$store$productLi;
+        var newDiscountList, result;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.prev = 0;
+              newDiscountList = this.store.originalDiscountList;
+              this.setDiscountList(newDiscountList);
+              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
+                _context8.next = 6;
+                break;
+              }
+              result = this.calcDiscount(this.store.productList);
+              _context8.next = 6;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
+            case 6:
+              _context8.next = 8;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
+            case 8:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8, this);
+      }));
+      function bestDiscount() {
+        return _bestDiscount.apply(this, arguments);
+      }
+      return bestDiscount;
+    }() // 加载准备配置
+  }, {
+    key: "loadPrepareConfig",
+    value: function () {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              _context9.prev = 0;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context8.next = 4;
+              _context9.next = 4;
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
@@ -601,7 +635,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_discount_card: 1
               });
             case 4:
-              goodPassList = _context8.sent;
+              goodPassList = _context9.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -612,29 +646,30 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return !scanDiscountIds.includes(n.id);
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || []));
+              this.store.originalDiscountList = newDiscountList;
               this.setDiscountList(newDiscountList || []);
-              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 14;
+              if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
+                _context9.next = 15;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context8.next = 14;
+              _context9.next = 15;
               return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 14:
-              _context8.next = 16;
+            case 15:
+              _context9.next = 17;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
-            case 16:
-              _context8.next = 21;
+            case 17:
+              _context9.next = 22;
               break;
-            case 18:
-              _context8.prev = 18;
-              _context8.t0 = _context8["catch"](0);
-              console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
-            case 21:
+            case 19:
+              _context9.prev = 19;
+              _context9.t0 = _context9["catch"](0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
+            case 22:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this, [[0, 18]]);
+        }, _callee9, this, [[0, 19]]);
       }));
       function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -1,4 +1,4 @@
-import { DiscountModule } from '../../modules/Discount';
+import { DiscountModule, Discount } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
@@ -22,4 +22,5 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    originalDiscountList: Discount[];
 }

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

@@ -30,3 +30,4 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     clear(): Promise<void>;
     storeChange(): void;
 }
+export type { Discount } from './types';

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

@@ -10,7 +10,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Order/index.ts
@@ -25,6 +35,7 @@ module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -143,6 +154,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderData.bookings = [];
         orderData.relation_products = [];
       }
+      if (!params.order_id && !orderData.schedule_date) {
+        orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+      }
       console.log("[Order] 调用后端接口创建订单:", {
         url: "/order/checkout",
         orderType: orderData.type,

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

@@ -476,6 +476,48 @@ export interface OnSearchIdentificationCodeCompletedEventData {
     /** 搜索参数 */
     searchParams: SearchIdentificationCodeParams;
 }
+/**
+ * 钱包初始化开始事件数据
+ */
+export interface OnWalletInitializationStartedEventData {
+    /** 业务数据 */
+    businessData: WalletInitBusinessData;
+    /** 开始时间 */
+    startTime: number;
+}
+/**
+ * 钱包初始化完成事件数据
+ */
+export interface OnWalletInitializationCompletedEventData {
+    /** 业务数据 */
+    businessData: WalletInitBusinessData;
+    /** 初始化结果 */
+    result: {
+        walletRecommendList: WalletRecommendItem[];
+        userIdentificationCodes: UserIdentificationCodeItem[];
+    };
+    /** 开始时间 */
+    startTime: number;
+    /** 结束时间 */
+    endTime: number;
+    /** 执行时长（毫秒） */
+    duration: number;
+}
+/**
+ * 钱包初始化失败事件数据
+ */
+export interface OnWalletInitializationFailedEventData {
+    /** 业务数据 */
+    businessData: WalletInitBusinessData;
+    /** 错误信息 */
+    error: Error;
+    /** 开始时间 */
+    startTime: number;
+    /** 结束时间 */
+    endTime: number;
+    /** 执行时长（毫秒） */
+    duration: number;
+}
 /**
  * 钱包支付事件枚举
  */
@@ -485,7 +527,10 @@ export declare enum WalletPassHooks {
     OnUserIdentificationCodesUpdated = "wallet:onUserIdentificationCodesUpdated",
     OnUserIdentificationCodesCleared = "wallet:onUserIdentificationCodesCleared",
     OnWalletCacheCleared = "wallet:onWalletCacheCleared",
-    OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted"
+    OnSearchIdentificationCodeCompleted = "wallet:onSearchIdentificationCodeCompleted",
+    OnWalletInitializationStarted = "wallet:onWalletInitializationStarted",
+    OnWalletInitializationCompleted = "wallet:onWalletInitializationCompleted",
+    OnWalletInitializationFailed = "wallet:onWalletInitializationFailed"
 }
 /**
  * 支付钩子事件（统一接口）

package/lib/modules/Payment/types.js

@@ -69,6 +69,9 @@ var WalletPassHooks = /* @__PURE__ */ ((WalletPassHooks2) => {
   WalletPassHooks2["OnUserIdentificationCodesCleared"] = "wallet:onUserIdentificationCodesCleared";
   WalletPassHooks2["OnWalletCacheCleared"] = "wallet:onWalletCacheCleared";
   WalletPassHooks2["OnSearchIdentificationCodeCompleted"] = "wallet:onSearchIdentificationCodeCompleted";
+  WalletPassHooks2["OnWalletInitializationStarted"] = "wallet:onWalletInitializationStarted";
+  WalletPassHooks2["OnWalletInitializationCompleted"] = "wallet:onWalletInitializationCompleted";
+  WalletPassHooks2["OnWalletInitializationFailed"] = "wallet:onWalletInitializationFailed";
   return WalletPassHooks2;
 })(WalletPassHooks || {});
 var PaymentHooks = /* @__PURE__ */ ((PaymentHooks2) => {

package/lib/modules/Payment/walletpass.js

@@ -88,11 +88,36 @@ var WalletPassPaymentImpl = class {
    * 内部生成参数，然后调用标准的初始化流程
    */
   async initializeWalletDataFromBusinessAsync(businessData) {
+    const startTime = Date.now();
+    this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationStarted, {
+      businessData,
+      startTime
+    });
     try {
       const walletParams = this.generateWalletParams(businessData);
-      return await this.initializeWalletDataAsync(walletParams);
+      const result = await this.initializeWalletDataAsync(walletParams);
+      const endTime = Date.now();
+      const duration = endTime - startTime;
+      this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationCompleted, {
+        businessData,
+        result,
+        startTime,
+        endTime,
+        duration
+      });
+      console.log(`[WalletPass] 从业务数据初始化钱包数据成功，耗时: ${duration}ms`);
+      return result;
     } catch (error) {
-      console.error("[WalletPass] 从业务数据初始化钱包数据失败:", error);
+      const endTime = Date.now();
+      const duration = endTime - startTime;
+      this.emitEvent(import_types.WalletPassHooks.OnWalletInitializationFailed, {
+        businessData,
+        error,
+        startTime,
+        endTime,
+        duration
+      });
+      console.error(`[WalletPass] 从业务数据初始化钱包数据失败，耗时: ${duration}ms`, error);
       throw error;
     }
   }

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

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

package/lib/solution/Checkout/index.js

@@ -137,7 +137,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
   }
   getProductListByOrder() {
-    var _a;
+    var _a, _b, _c, _d, _e;
     if (!this.store.currentOrder) {
       return [];
     }
@@ -146,15 +146,21 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    const productList = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings.map(
+    const productList = ((_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings) == null ? void 0 : _b.map(
       (item) => ({
         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;
+    )) || [];
+    const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map((item) => ({
+      product_id: item.product_id,
+      product_variant_id: item.product_variant_id,
+      quantity: item.num,
+      selling_price: item.source_product_price
+    }))) || [];
+    return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
     var _a, _b, _c;
@@ -902,6 +908,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @throws 当前没有活跃订单时抛出错误
    */
   async addPaymentItemAsync(paymentItem) {
+    var _a, _b;
     try {
       if (!this.store.currentOrder) {
         throw (0, import_utils.createCheckoutError)(
@@ -924,12 +931,29 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         paymentItem
       );
       console.log("[Checkout] 支付项添加成功");
-      const currentOrderId = this.store.currentOrder.order_id;
-      const isCurrentOrderReal = currentOrderId && !this.isVirtualOrderId(currentOrderId);
-      console.log("[Checkout] 准备同步订单数据:", {
-        当前订单ID: currentOrderId,
-        是否为真实ID: isCurrentOrderReal
+      const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
+      console.log("[Checkout] EFTPOS 支付检查:", {
+        paymentCode: paymentItem.code,
+        paymentType: paymentItem.type,
+        isEftposPayment,
+        currentOrderSynced: this.store.isOrderSynced
       });
+      if (isEftposPayment) {
+        console.log("[Checkout] 检测到 EFTPOS 支付，立即同步订单到后端...");
+        try {
+          await this.syncOrderToBackendWithReturn(true);
+          console.log("[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):", {
+            订单ID: this.store.currentOrder.order_id,
+            是否已同步: this.store.isOrderSynced
+          });
+        } catch (error) {
+          console.error("[Checkout] EFTPOS 支付后订单同步失败:", error);
+          await this.handleError(
+            new Error(`EFTPOS 支付后订单同步失败: ${error instanceof Error ? error.message : String(error)}`),
+            import_types.CheckoutErrorType.OrderCreationFailed
+          );
+        }
+      }
       await this.updateStateAmountToRemaining();
       await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
         orderUuid: this.store.currentOrder.uuid,
@@ -1486,10 +1510,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentOrder.uuid
       );
       const filteredPaymentItems = allPaymentItems.filter(
-        (payment) => !payment.voucher_id || payment.voucher_id.trim() === ""
+        (payment) => !payment.voucher_id
       );
       const voucherItems = allPaymentItems.filter(
-        (payment) => payment.voucher_id && payment.voucher_id.trim() !== ""
+        (payment) => payment.voucher_id
       );
       console.log("[Checkout] 支付项过滤结果:", {
         总支付项: allPaymentItems.length,
@@ -2017,12 +2041,18 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           false
           // 不包括已撤销的支付项
         );
-        const allPaymentsHaveVoucherId = currentPayments.length > 0 && currentPayments.every(
+        const hasPaymentItems = currentPayments.length > 0;
+        const allPaymentsHaveVoucherId = hasPaymentItems && currentPayments.every(
           (item) => item.status !== "voided" && item.voucher_id
         );
-        console.log("[Checkout] 支付项voucher_id检查:", {
+        const shouldAutoSync = hasPaymentItems && !allPaymentsHaveVoucherId;
+        console.log("[Checkout] 自动同步订单条件检查:", {
           paymentCount: currentPayments.length,
+          hasPaymentItems,
           allHaveVoucherId: allPaymentsHaveVoucherId,
+          isOrderSynced: this.store.isOrderSynced,
+          shouldAutoSync,
+          reason: shouldAutoSync ? "支付完成，需要同步最终支付状态" : "跳过同步",
           paymentItems: currentPayments.map((p) => ({
             uuid: p.uuid,
             code: p.code,
@@ -2031,11 +2061,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             status: p.status
           }))
         });
-        if (allPaymentsHaveVoucherId) {
-          console.log("[Checkout] 所有支付项均为代金券类型，跳过订单同步");
-        } else {
-          console.log("[Checkout] 支付完成但订单未同步，开始同步订单到后端...");
+        if (shouldAutoSync) {
+          console.log("[Checkout] 满足自动同步条件，开始同步订单到后端...");
           await this.syncOrderToBackend();
+        } else {
+          if (!hasPaymentItems) {
+            console.log("[Checkout] 没有支付项，跳过订单同步");
+          } else if (allPaymentsHaveVoucherId) {
+            console.log("[Checkout] 所有支付项均为代金券类型，跳过订单同步");
+          }
         }
         await this.core.effects.emit(import_types.CheckoutHooks.OnOrderPaymentCompleted, {
           orderUuid: this.store.currentOrder.uuid,
@@ -2098,7 +2132,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的真实订单ID
    */
   async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
@@ -2198,7 +2232,38 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     } else {
       console.log("[Checkout] 创建新订单操作");
     }
-    const checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+    const startTime = Date.now();
+    await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSubmitStart, {
+      orderUuid: this.store.currentOrder.uuid,
+      operation: isUpdateOperation ? "update" : "create",
+      isManual,
+      paymentItemCount: paymentItems.length,
+      timestamp: startTime
+    });
+    let checkoutResponse;
+    let submitSuccess = false;
+    let submitError;
+    try {
+      checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+      submitSuccess = true;
+      console.log("[Checkout] 下单接口调用成功");
+    } catch (error) {
+      submitSuccess = false;
+      submitError = error instanceof Error ? error.message : String(error);
+      console.error("[Checkout] 下单接口调用失败:", submitError);
+      throw error;
+    } finally {
+      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSubmitEnd, {
+        success: submitSuccess,
+        orderUuid: this.store.currentOrder.uuid,
+        operation: isUpdateOperation ? "update" : "create",
+        isManual,
+        orderId: submitSuccess ? ((_d = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _d.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        error: submitError,
+        duration: Date.now() - startTime,
+        timestamp: Date.now()
+      });
+    }
     console.log("[Checkout] 后端返回的响应数据:", {
       status: checkoutResponse == null ? void 0 : checkoutResponse.status,
       code: checkoutResponse == null ? void 0 : checkoutResponse.code,
@@ -2210,7 +2275,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       realOrderId = currentOrderId;
       console.log(`[Checkout] 订单更新成功，订单ID: ${realOrderId}`);
     } else {
-      let extractedOrderId = (_d = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _d.order_id;
+      let extractedOrderId = (_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }
@@ -2535,9 +2600,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.store.currentCustomer = void 0;
       this.store.lastError = void 0;
       this.store.cartItems = [];
+      this.payment.wallet.clearAllCache();
       await this.setStatus(import_types.CheckoutStatus.Ready);
       await this.setStep(import_types.CheckoutStep.OrderConfirmation);
-      this.payment.wallet.clearAllCache();
       console.log("[Checkout] Store 状态重置完成");
       if (prevOrderInfo) {
         await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCleared, {