@pisell/pisellos 2.2.210 → 2.2.212

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

@@ -249,7 +249,7 @@ export interface OrderTempOrder {
     delivery_type?: string;
     table_number?: Record<string, any>;
     schedule_date: string;
-    created_at: string;
+    created_at: string | undefined;
     request_unique_idempotency_token?: string;
     products: OrderProduct[];
     bookings: any[];
@@ -261,6 +261,7 @@ export interface OrderTempOrder {
     contacts_info: Record<string, any> | null;
     holder: Record<string, any> | null;
     metadata: Record<string, any>;
+    summary?: OrderSummary;
     _extend?: {
         productsByUid?: Record<string, Record<string, any>>;
         [key: string]: any;
@@ -280,6 +281,7 @@ export interface OrderSubmitPayload extends Omit<OrderTempOrder, 'platform' | 'p
         form_record_id: number | string;
     }>;
     products: OrderSubmitProduct[];
+    summary?: OrderSummary;
     small_ticket_data_flag?: number;
 }
 export interface OrderState {
@@ -410,6 +412,7 @@ export interface SubmitSalesOrderParams {
         contacts_info: Record<string, any> | null;
         holder: Record<string, any> | null;
         metadata: Record<string, any>;
+        summary?: OrderSummary;
         small_ticket_data_flag?: number;
     };
 }

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

@@ -187,6 +187,7 @@ export declare function buildSubmitPayload(params: {
     businessCode?: string;
     channel?: string;
     type?: string;
+    summary?: OrderSummary | null;
     enhance?: SubmitPayloadEnhancer;
 }): OrderSubmitPayload;
 export declare function mapPaymentItemToOrderPayment(paymentItem: OrderPaymentSource): OrderPaymentData;

package/lib/modules/Order/utils.js

@@ -608,7 +608,8 @@ var SUBMIT_BOOKING_METADATA_WHITELIST = [
   "collect_pax",
   "capacity",
   "holder_id",
-  "resource_select_type"
+  "resource_select_type",
+  "holder"
 ];
 function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === "1" || booking.is_all === "true" ? 1 : 0;
@@ -684,7 +685,7 @@ function createDefaultTempOrder(params) {
     surcharge_fee: "0.00",
     note: "",
     schedule_date: params.now,
-    created_at: params.now,
+    created_at: void 0,
     request_unique_idempotency_token: "",
     vouchers: [],
     products: [],
@@ -711,6 +712,7 @@ function buildSubmitPayload(params) {
     businessCode,
     channel,
     type,
+    summary,
     enhance
   } = params;
   const scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
@@ -778,7 +780,7 @@ function buildSubmitPayload(params) {
     // contacts: tempOrder.contacts || [],
     contacts_info: tempOrder.contacts_info && !Array.isArray(tempOrder.contacts_info) ? tempOrder.contacts_info : null,
     // holder: tempOrder.holder || null,
-    // summary,
+    summary: summary || tempOrder.summary || (0, import_utils.createEmptySummary)(),
     metadata: (() => {
       const {
         collect_pax: _collectPax,
@@ -791,7 +793,13 @@ function buildSubmitPayload(params) {
       (product) => normalizeSubmitProduct(product)
     )
   };
-  return enhance ? enhance(payload, { tempOrder, bookingUuid, now }) : payload;
+  if (!enhance)
+    return payload;
+  const enhancedPayload = enhance(payload, { tempOrder, bookingUuid, now });
+  return {
+    ...enhancedPayload,
+    summary: enhancedPayload.summary ?? payload.summary
+  };
 }
 function mapPaymentItemToOrderPayment(paymentItem) {
   const item = paymentItem;

package/lib/modules/Quotation/index.js

@@ -49,7 +49,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     const res = await this.request.get(
       "/quotation/available",
       query,
-      { useCache: false }
+      { useCache: false, osServer: true }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
     list.sort((a, b) => a.sort - b.sort);

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

@@ -8,6 +8,7 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private appPlugin;
     private store;
     private request;
+    private surchargeListModuleName;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     getSurchargeList(): Promise<void>;

package/lib/modules/SalesSummary/index.js

@@ -38,15 +38,17 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     super(name, version);
     this.defaultName = "salesSummary";
     this.defaultVersion = "1.0.0";
+    this.surchargeListModuleName = "surchargeList";
   }
   async initialize(core, options) {
-    var _a, _b;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     this.appPlugin = this.core.getPlugin("app");
     this.request = this.core.getPlugin("request");
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
+    this.surchargeListModuleName = ((_c = options.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
     if (!this.appPlugin) {
       throw new Error("SalesSummaryModule 需要 app 插件支持");
     }
@@ -57,9 +59,17 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   }
   async getSurchargeList() {
     try {
+      const surchargeListModule = this.core.getModule(
+        this.surchargeListModuleName
+      );
+      if (surchargeListModule == null ? void 0 : surchargeListModule.getSurchargeList) {
+        this.store.surchargeList = await surchargeListModule.getSurchargeList();
+        return;
+      }
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
+          // TODO 真实的渠道
           channel: "online-store",
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,

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

@@ -0,0 +1,16 @@
+import { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../BaseModule';
+import { SurchargeListItem, SurchargeListModuleAPI } from './types';
+export * from './types';
+export declare class SurchargeListModule extends BaseModule implements Module, SurchargeListModuleAPI {
+    protected defaultName: string;
+    protected defaultVersion: string;
+    private request;
+    private store;
+    private loadingPromise;
+    constructor(name?: string, version?: string);
+    initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    getSurchargeList(): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+    private loadSurchargeList;
+}

package/lib/modules/SurchargeList/index.js

@@ -0,0 +1,89 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/SurchargeList/index.ts
+var SurchargeList_exports = {};
+__export(SurchargeList_exports, {
+  SurchargeListModule: () => SurchargeListModule
+});
+module.exports = __toCommonJS(SurchargeList_exports);
+var import_BaseModule = require("../BaseModule");
+__reExport(SurchargeList_exports, require("./types"), module.exports);
+var SurchargeListModule = class extends import_BaseModule.BaseModule {
+  constructor(name, version) {
+    super(name, version);
+    this.defaultName = "surchargeList";
+    this.defaultVersion = "1.0.0";
+    this.loadingPromise = null;
+  }
+  async initialize(core, options) {
+    var _a, _b, _c;
+    this.core = core;
+    this.store = options.store;
+    this.request = this.core.getPlugin("request");
+    const hasInitialSurchargeList = Array.isArray(
+      (_a = options.initialState) == null ? void 0 : _a.surchargeList
+    );
+    this.store.surchargeList = hasInitialSurchargeList ? (_b = options.initialState) == null ? void 0 : _b.surchargeList : [];
+    this.store.isLoaded = Boolean((_c = options.initialState) == null ? void 0 : _c.isLoaded) || hasInitialSurchargeList;
+    if (!this.request) {
+      throw new Error("SurchargeListModule 需要 request 插件支持");
+    }
+  }
+  async getSurchargeList() {
+    if (this.store.isLoaded)
+      return this.store.surchargeList;
+    if (this.loadingPromise)
+      return this.loadingPromise;
+    this.loadingPromise = this.loadSurchargeList();
+    return this.loadingPromise;
+  }
+  async refreshSurchargeList() {
+    this.loadingPromise = this.loadSurchargeList();
+    return this.loadingPromise;
+  }
+  async loadSurchargeList() {
+    try {
+      const surchargeList = await this.request.get(
+        "/order/custom-surcharge/available/v2",
+        {
+          channel: "online-store",
+          is_assemble_product_data: 1,
+          is_assemble_schedule_data: 1,
+          with: ["relationSchedule"]
+        }
+      );
+      this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      this.store.isLoaded = true;
+      return this.store.surchargeList;
+    } catch (error) {
+      console.warn("[SurchargeListModule] 加载附加费配置失败", error);
+      this.store.surchargeList = [];
+      this.store.isLoaded = true;
+      return this.store.surchargeList;
+    } finally {
+      this.loadingPromise = null;
+    }
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SurchargeListModule,
+  ...require("./types")
+});

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

@@ -0,0 +1,11 @@
+export interface SurchargeListItem {
+    [key: string]: any;
+}
+export interface SurchargeListState {
+    surchargeList: SurchargeListItem[];
+    isLoaded: boolean;
+}
+export interface SurchargeListModuleAPI {
+    getSurchargeList(): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(): Promise<SurchargeListItem[]>;
+}

package/lib/modules/SurchargeList/types.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/SurchargeList/types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/lib/modules/index.d.ts

@@ -12,6 +12,7 @@ export * from './Resource';
 export * from './Step';
 export * from './Summary';
 export * from './SalesSummary';
+export * from './SurchargeList';
 export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';

package/lib/modules/index.js

@@ -30,6 +30,7 @@ __reExport(modules_exports, require("./Resource"), module.exports);
 __reExport(modules_exports, require("./Step"), module.exports);
 __reExport(modules_exports, require("./Summary"), module.exports);
 __reExport(modules_exports, require("./SalesSummary"), module.exports);
+__reExport(modules_exports, require("./SurchargeList"), module.exports);
 __reExport(modules_exports, require("./Schedule"), module.exports);
 __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
@@ -51,6 +52,7 @@ __reExport(modules_exports, require("./BookingContext"), module.exports);
   ...require("./Step"),
   ...require("./Summary"),
   ...require("./SalesSummary"),
+  ...require("./SurchargeList"),
   ...require("./Schedule"),
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),

package/lib/server/index.d.ts

@@ -27,6 +27,8 @@ declare class Server {
     payment?: PaymentServerModule;
     private paymentRouteModule?;
     private paymentRouteModuleInFlight?;
+    private quotationAvailableCache;
+    private quotationAvailableInFlight;
     /** GET 前缀路由（最长前缀优先匹配） */
     private prefixRouterGet;
     router: Router;
@@ -177,6 +179,9 @@ declare class Server {
     private registerServerRoutes;
     private getPaymentRouteModule;
     private handlePaymentMethods;
+    private handleQuotationAvailable;
+    private fetchQuotationAvailableFromAPI;
+    private isSuccessfulRemoteResponse;
     /**
      * 根据 subscriberId 移除商品查询订阅者
      */
@@ -432,6 +437,9 @@ declare class Server {
     private shouldForceRemoteSalesDetail;
     private buildOrderSalesDetailBackendPath;
     private extractOrderDataFromCheckoutResponse;
+    private getCheckoutExternalSaleNumber;
+    private buildCheckoutSyncSuccessPatch;
+    private isMergeableCheckoutOrder;
     private normalizeCheckoutResponse;
     private isCheckoutResponseRejected;
     private extractBackendErrorResponse;

package/lib/server/index.js

@@ -53,6 +53,8 @@ var import_small_ticket = require("./utils/small-ticket");
 __reExport(server_exports, require("./modules"), module.exports);
 var Server = class {
   constructor(core) {
+    this.quotationAvailableCache = /* @__PURE__ */ new Map();
+    this.quotationAvailableInFlight = /* @__PURE__ */ new Map();
     /** GET 前缀路由（最长前缀优先匹配） */
     this.prefixRouterGet = [];
     // 路由注册表
@@ -167,6 +169,29 @@ var Server = class {
         data: payMethods
       };
     };
+    this.handleQuotationAvailable = async ({ data }) => {
+      const queryPayload = data && typeof data === "object" ? { ...data } : {};
+      const cacheKey = this.stableSerialize(queryPayload);
+      if (this.quotationAvailableCache.has(cacheKey)) {
+        this.logInfo("handleQuotationAvailable: 命中运行时缓存", { cacheKey });
+        return this.quotationAvailableCache.get(cacheKey);
+      }
+      const inFlight = this.quotationAvailableInFlight.get(cacheKey);
+      if (inFlight) {
+        this.logInfo("handleQuotationAvailable: 复用进行中的请求", { cacheKey });
+        return inFlight;
+      }
+      const requestPromise = this.fetchQuotationAvailableFromAPI(queryPayload).then((response) => {
+        if (this.isSuccessfulRemoteResponse(response)) {
+          this.quotationAvailableCache.set(cacheKey, response);
+        }
+        return response;
+      }).finally(() => {
+        this.quotationAvailableInFlight.delete(cacheKey);
+      });
+      this.quotationAvailableInFlight.set(cacheKey, requestPromise);
+      return requestPromise;
+    };
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -1091,7 +1116,7 @@ var Server = class {
       return this.taskTimeout("app.request 不可用");
     }
     try {
-      const response = await this.app.request.post("/shop/order/sales/checkout", data, {
+      const response = await this.app.request.post(backendPath, data, {
         isShopApi: true,
         customToast: () => {
         }
@@ -1105,28 +1130,47 @@ var Server = class {
         return this.taskFail("BACKEND_REJECTED", message, response);
       }
       const fresh = this.extractOrderDataFromCheckoutResponse(response);
-      if (!fresh) {
-        this.logWarning(`${title}: sync_sales 返回未包含可同步订单`, {
-          backendPath,
-          response
-        });
-        return this.taskTimeout("checkout 返回未包含可同步订单");
-      }
-      const syncedOrder = { ...fresh, need_sync: 0 };
-      if (this.order) {
+      const externalSaleNumber = this.getCheckoutExternalSaleNumber(data, payload);
+      const shouldMergeRemoteOrder = fresh ? this.isMergeableCheckoutOrder(fresh, externalSaleNumber) : false;
+      let syncedOrder;
+      if (this.order && fresh && shouldMergeRemoteOrder) {
+        syncedOrder = {
+          ...fresh,
+          external_sale_number: fresh.external_sale_number ?? externalSaleNumber,
+          need_sync: 0
+        };
         await this.order.upsertOrdersFromRemote([syncedOrder]);
-        this.logInfo(`${title}: sync_sales 订单已同步到本地`, {
+        this.logInfo(`${title}: sync_sales 完整订单已同步到本地`, {
           order_id: fresh.order_id,
-          external_sale_number: fresh.external_sale_number,
+          external_sale_number: syncedOrder.external_sale_number,
           order_number: fresh.order_number
         });
+      } else if (this.order && externalSaleNumber && typeof this.order.markOrderSyncedByExternalSaleNumber === "function") {
+        const patch = this.buildCheckoutSyncSuccessPatch(fresh);
+        const result = await this.order.markOrderSyncedByExternalSaleNumber({
+          externalSaleNumber,
+          patch
+        });
+        syncedOrder = (result == null ? void 0 : result.order) || {
+          ...data,
+          ...patch,
+          external_sale_number: externalSaleNumber,
+          need_sync: 0
+        };
+        this.logInfo(`${title}: sync_sales 已按 external_sale_number 标记本地订单`, {
+          order_id: (syncedOrder == null ? void 0 : syncedOrder.order_id) ?? null,
+          external_sale_number: externalSaleNumber,
+          hasRemoteOrder: !!fresh,
+          mergedRemoteOrder: false
+        });
       } else {
         this.logWarning(`${title}: sync_sales Order 模块未注册`, {
           backendPath,
-          order_id: fresh.order_id
+          external_sale_number: externalSaleNumber,
+          order_id: fresh == null ? void 0 : fresh.order_id
         });
       }
-      if (this.shouldPrintSyncedOrder({ checkoutData: data, syncedOrder })) {
+      if (syncedOrder && this.shouldPrintSyncedOrder({ checkoutData: data, syncedOrder })) {
         await this.dispatchPrintOtherReceiptTask({
           checkoutData: data,
           syncedOrder,
@@ -1135,7 +1179,7 @@ var Server = class {
         });
       }
       return this.taskOk({
-        order: syncedOrder,
+        order: syncedOrder ?? null,
         response: this.normalizeCheckoutResponse(response)
       });
     } catch (error) {
@@ -1504,6 +1548,16 @@ var Server = class {
         path: "/shop/pay/custom-payment/all",
         handler: this.handlePaymentMethods.bind(this)
       },
+      {
+        method: "get",
+        path: "/shop/quotation/available",
+        handler: this.handleQuotationAvailable.bind(this)
+      },
+      {
+        method: "get",
+        path: "/quotation/available",
+        handler: this.handleQuotationAvailable.bind(this)
+      },
       {
         method: "post",
         path: "/shop/order/sales/checkout",
@@ -1552,6 +1606,31 @@ var Server = class {
     });
     return this.paymentRouteModuleInFlight;
   }
+  async fetchQuotationAvailableFromAPI(data) {
+    var _a;
+    const requester = ((_a = this.app) == null ? void 0 : _a.request) || this.core.getPlugin("request");
+    if (!(requester == null ? void 0 : requester.get)) {
+      this.logError("fetchQuotationAvailableFromAPI: request 不可用");
+      return {
+        code: 500,
+        message: "request 不可用",
+        data: { list: [] },
+        status: false
+      };
+    }
+    return requester.get("/shop/quotation/available", data);
+  }
+  isSuccessfulRemoteResponse(response) {
+    if (!response)
+      return false;
+    if (response.status === false)
+      return false;
+    if (typeof response.status === "number" && response.status >= 400)
+      return false;
+    if (response.code !== void 0 && response.code !== 200 && response.code !== "200")
+      return false;
+    return true;
+  }
   /**
    * 根据 subscriberId 移除商品查询订阅者
    */
@@ -2214,7 +2293,7 @@ var Server = class {
         return res == null ? void 0 : res.short_number;
       }
     }
-    return this.getAppData("device_id") || 0;
+    return String(this.getAppData("device_id") || 0).slice(-2);
   }
   buildCheckoutTaskIdempotencyKey(data) {
     const identity = (data == null ? void 0 : data.request_unique_idempotency_token) || (data == null ? void 0 : data.external_sale_number) || (data == null ? void 0 : data.order_id) || (data == null ? void 0 : data.shop_order_number) || (data == null ? void 0 : data.shop_full_order_number);
@@ -2261,7 +2340,7 @@ var Server = class {
     return next;
   }
   async dispatchCheckoutSyncTask(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     this.registerDeviceTaskActions();
     const deviceTask = this.getDeviceTaskPlugin();
     const debugDeviceId = await this.getShortNumberOrDeviceId();
@@ -2277,6 +2356,7 @@ var Server = class {
         payload: {
           backendPath: params.backendPath,
           data: params.data,
+          external_sale_number: (_a = params.data) == null ? void 0 : _a.external_sale_number,
           title: params.title
         },
         retry_limit: 5,
@@ -2284,7 +2364,7 @@ var Server = class {
         name: "同步订单",
         source: "server",
         source_type: "order",
-        source_id: ((_a = params.data) == null ? void 0 : _a.order_id) || ((_b = params.data) == null ? void 0 : _b.external_sale_number) || ((_c = params.data) == null ? void 0 : _c.shop_order_number)
+        source_id: ((_b = params.data) == null ? void 0 : _b.order_id) || ((_c = params.data) == null ? void 0 : _c.external_sale_number) || ((_d = params.data) == null ? void 0 : _d.shop_order_number)
       });
       this.logInfo(`${params.title}: sync_sales 任务已派发`, {
         uuid: result == null ? void 0 : result.uuid,
@@ -2381,7 +2461,9 @@ var Server = class {
     });
     if ((pendingResult == null ? void 0 : pendingResult.status) === true) {
       const pendingOrder = pendingResult.data;
-      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder)) {
+      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && // TODO 这里先加个兼容，只有 type 为 virtual 才走打印
+      // 后期需要迁移到 picoding ，根据工作流配置
+      checkoutData.type === "virtual") {
         await this.dispatchLocalReceiptPrint({
           checkoutData,
           order: pendingOrder,
@@ -2771,6 +2853,39 @@ var Server = class {
     }
     return null;
   }
+  getCheckoutExternalSaleNumber(data, payload) {
+    var _a;
+    const candidates = [
+      payload == null ? void 0 : payload.external_sale_number,
+      data == null ? void 0 : data.external_sale_number,
+      (_a = payload == null ? void 0 : payload.data) == null ? void 0 : _a.external_sale_number
+    ];
+    const value = candidates.find((candidate) => candidate !== void 0 && candidate !== null && candidate !== "");
+    return value === void 0 ? void 0 : String(value);
+  }
+  buildCheckoutSyncSuccessPatch(fresh) {
+    if (!fresh)
+      return {};
+    const patch = {};
+    if (fresh.order_id !== void 0 && fresh.order_id !== null)
+      patch.order_id = fresh.order_id;
+    if (fresh.order_number !== void 0 && fresh.order_number !== null) {
+      patch.order_number = fresh.order_number;
+    }
+    return patch;
+  }
+  isMergeableCheckoutOrder(order, externalSaleNumber) {
+    if (!order || typeof order !== "object")
+      return false;
+    const orderExternalSaleNumber = order.external_sale_number;
+    if (externalSaleNumber && orderExternalSaleNumber !== void 0 && orderExternalSaleNumber !== null && String(orderExternalSaleNumber) !== externalSaleNumber) {
+      return false;
+    }
+    if (externalSaleNumber && (orderExternalSaleNumber === void 0 || orderExternalSaleNumber === null || orderExternalSaleNumber === "")) {
+      return false;
+    }
+    return Array.isArray(order.products) || Array.isArray(order.bookings) || Array.isArray(order.payments) || !!order.summary || order.order_number !== void 0 || order.payment_status !== void 0 || order.status !== void 0;
+  }
   normalizeCheckoutResponse(response) {
     if (response && typeof response === "object" && (response.code !== void 0 || response.status !== void 0)) {
       return response;

package/lib/server/modules/order/index.d.ts

@@ -87,6 +87,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     silentRefresh(): Promise<OrderData[]>;
     getOrdersByResourceId(resourceId: string | number): OrderData[];
+    private normalizeOrderForMemoryList;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
      * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -99,6 +100,13 @@ export declare class OrderModule extends BaseModule implements Module {
      * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
      */
     upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
+    markOrderSyncedByExternalSaleNumber(params: {
+        externalSaleNumber: OrderId;
+        patch?: Partial<OrderData>;
+    }): Promise<{
+        updated: boolean;
+        order?: OrderData;
+    }>;
     /**
      * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
      * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
@@ -111,6 +119,7 @@ export declare class OrderModule extends BaseModule implements Module {
     getRoutes(): RouteDefinition[];
     destroy(): void;
     private syncOrdersMap;
+    private getOrderIdentityKeys;
     private extractResourceIds;
     private getOrderDateKey;
     /**