@pisell/pisellos 2.2.210 → 2.2.211

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;
     /**

package/lib/server/modules/order/index.js

@@ -45,7 +45,8 @@ var ORDER_SILENT_REFRESH_MIN_INTERVAL_MS = 3e4;
 var ORDER_BUSINESS_WRITE_SOURCES = /* @__PURE__ */ new Set([
   "upsertOrdersFromRemote",
   "upsertPendingSyncOrders",
-  "overwriteExistingOrder"
+  "overwriteExistingOrder",
+  "markOrderSyncedByExternalSaleNumber"
 ]);
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -72,7 +73,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async emitOrdersChanged(changedOrders = [], source) {
     const payload = {
       list: this.store.list,
-      changedOrders,
+      changedOrders: changedOrders.map((order) => this.normalizeOrderForMemoryList(order)),
       source
     };
     await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, payload);
@@ -131,7 +132,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     }
     if (Array.isArray((_b = options == null ? void 0 : options.initialState) == null ? void 0 : _b.list)) {
-      this.store.list = options.initialState.list;
+      this.store.list = options.initialState.list.map((order) => this.normalizeOrderForMemoryList(order));
       this.syncOrdersMap();
       this.emitOrdersChanged([], "initialState");
     } else {
@@ -377,9 +378,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const localOrder = orders.find((order) => this.isOrderLookupMatch(order, key));
     if (!localOrder)
       return null;
-    this.store.list = orders;
+    this.store.list = orders.map((order) => this.normalizeOrderForMemoryList(order));
     this.syncOrdersMap();
-    return localOrder;
+    return this.normalizeOrderForMemoryList(localOrder);
   }
   async loadOrdersByServer() {
     var _a;
@@ -402,16 +403,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.markOrderPulledAtNow();
         this.lastServerFullFetchAtMs = Date.now();
       } catch {
-        orderList = [];
-        this.logInfo("loadOrdersByServer-SSE拉取失败，回退为空数组");
+        this.logInfo("loadOrdersByServer-SSE拉取失败，保持当前内存订单");
+        return this.store.list;
       }
     }
-    await this.replaceOrdersSnapshotInSQLite(orderList, "loadOrdersByServer");
+    const mergedOrders = await this.replaceOrdersSnapshotInSQLite(orderList, "loadOrdersByServer");
+    const memoryOrders = mergedOrders.map((order) => this.normalizeOrderForMemoryList(order));
     this.logInfo("loadOrdersByServer-结束", {
-      count: orderList.length
+      count: memoryOrders.length
     });
-    await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, orderList);
-    return orderList;
+    await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, memoryOrders);
+    return memoryOrders;
   }
   /**
    * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -453,6 +455,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const ids = this.resourceIdIndex.get(String(resourceId)) || [];
     return ids.map((id) => this.store.map.get(id)).filter((order) => !!order);
   }
+  normalizeOrderForMemoryList(order) {
+    const externalSaleNumber = order == null ? void 0 : order.external_sale_number;
+    if ((order == null ? void 0 : order.order_id) !== void 0 && (order == null ? void 0 : order.order_id) !== null && (order == null ? void 0 : order.order_id) !== "") {
+      return order;
+    }
+    if (externalSaleNumber === void 0 || externalSaleNumber === null || externalSaleNumber === "") {
+      return order;
+    }
+    return {
+      ...order,
+      order_id: externalSaleNumber
+    };
+  }
   /**
    * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
    * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -499,6 +514,51 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length });
     await this.mergeOrdersToStore(freshOrders, "upsertOrdersFromRemote");
   }
+  async markOrderSyncedByExternalSaleNumber(params) {
+    const externalSaleNumber = params.externalSaleNumber;
+    if (externalSaleNumber === void 0 || externalSaleNumber === null || externalSaleNumber === "") {
+      this.logError("markOrderSyncedByExternalSaleNumber-缺少 external_sale_number");
+      return { updated: false };
+    }
+    const key = this.getIdKey(externalSaleNumber);
+    const targetIndex = this.store.list.findIndex((order) => {
+      const value = order == null ? void 0 : order.external_sale_number;
+      if (value === void 0 || value === null || value === "")
+        return false;
+      return this.getIdKey(value) === key;
+    });
+    if (targetIndex < 0) {
+      this.logInfo("markOrderSyncedByExternalSaleNumber-本地订单不存在，跳过", {
+        external_sale_number: externalSaleNumber
+      });
+      return { updated: false };
+    }
+    const existing = this.store.list[targetIndex];
+    const nextOrder = this.normalizeRemoteSyncedOrder({
+      ...existing,
+      ...params.patch || {},
+      external_sale_number: existing.external_sale_number ?? externalSaleNumber,
+      need_sync: 0
+    });
+    const storageKey = this.getOrderStorageKey(nextOrder) || key;
+    this.store.list = this.store.list.map((order, index) => {
+      if (index !== targetIndex)
+        return order;
+      return nextOrder;
+    });
+    this.syncOrdersMap();
+    await this.patchOrdersInSQLite(
+      [nextOrder],
+      "markOrderSyncedByExternalSaleNumber",
+      { [storageKey]: "update" }
+    );
+    this.logInfo("markOrderSyncedByExternalSaleNumber-完成", {
+      external_sale_number: externalSaleNumber,
+      order_id: nextOrder.order_id ?? null
+    });
+    await this.emitOrdersChanged([nextOrder], "markOrderSyncedByExternalSaleNumber");
+    return { updated: true, order: nextOrder };
+  }
   /**
    * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
    * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
@@ -509,11 +569,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return;
     }
     const pendingMap = /* @__PURE__ */ new Map();
+    const memoryPendingMap = /* @__PURE__ */ new Map();
     for (const order of pendingOrders) {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey)
         continue;
       pendingMap.set(storageKey, order);
+      memoryPendingMap.set(storageKey, this.normalizeOrderForMemoryList(order));
     }
     if (pendingMap.size === 0) {
       this.logError("upsertPendingSyncOrders-订单缺少可落库标识", {
@@ -528,12 +590,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey || !pendingMap.has(storageKey))
         return order;
-      const pendingOrder = pendingMap.get(storageKey);
+      const pendingOrder = memoryPendingMap.get(storageKey);
       pendingMap.delete(storageKey);
+      memoryPendingMap.delete(storageKey);
       mergeActions[storageKey] = "update";
       return pendingOrder;
     });
-    for (const [storageKey, order] of pendingMap.entries()) {
+    for (const [storageKey, order] of memoryPendingMap.entries()) {
       mergeActions[storageKey] = "insert";
       updatedList.push(order);
     }
@@ -545,6 +608,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       storeOrderCountAfter: this.store.list.length
     });
     this.emitOrdersChanged(patchedOrders, "upsertPendingSyncOrders");
+    await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, {
+      list: this.store.list,
+      changedOrders: patchedOrders.map((order) => this.normalizeOrderForMemoryList(order)),
+      source: "upsertPendingSyncOrders"
+    });
   }
   /**
    * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
@@ -581,21 +649,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.map.clear();
     this.resourceIdIndex.clear();
     for (const order of this.store.list) {
-      const id = order.order_id;
-      if (id === void 0 || id === null)
+      const identityKeys = this.getOrderIdentityKeys(order);
+      if (identityKeys.length === 0)
         continue;
-      this.store.map.set(this.getIdKey(id), order);
+      for (const identityKey of identityKeys) {
+        this.store.map.set(identityKey, order);
+      }
       const resourceIds = this.extractResourceIds(order);
+      const primaryIdentity = identityKeys[0];
       for (const resourceId of resourceIds) {
         const key = String(resourceId);
         const existing = this.resourceIdIndex.get(key) || [];
-        if (existing.some((eid) => this.getIdKey(eid) === this.getIdKey(id)))
+        if (existing.some((eid) => this.getIdKey(eid) === primaryIdentity))
           continue;
-        existing.push(id);
+        existing.push(primaryIdentity);
         this.resourceIdIndex.set(key, existing);
       }
     }
   }
+  getOrderIdentityKeys(order) {
+    const keys = [];
+    const id = order.order_id;
+    if (id !== void 0 && id !== null && id !== "") {
+      keys.push(this.getIdKey(id));
+    }
+    const externalSaleNumber = order == null ? void 0 : order.external_sale_number;
+    if (externalSaleNumber !== void 0 && externalSaleNumber !== null && externalSaleNumber !== "") {
+      const externalKey = this.getIdKey(externalSaleNumber);
+      if (!keys.includes(externalKey))
+        keys.push(externalKey);
+    }
+    return keys;
+  }
   extractResourceIds(order) {
     const ids = /* @__PURE__ */ new Set();
     const visitResources = (resources) => {
@@ -1190,9 +1275,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async replaceOrdersSnapshotInSQLite(orderList, source) {
     if (!this.dbManager) {
-      return;
+      return orderList.map((order) => this.normalizeRemoteSyncedOrder(order));
     }
     const remoteSnapshot = (0, import_lodash_es.cloneDeep)(orderList);
+    let mergedSnapshot = remoteSnapshot.map((order) => this.normalizeRemoteSyncedOrder(order));
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         const existingOrders = typeof this.dbManager.getAll === "function" ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
@@ -1200,6 +1286,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           remoteSnapshot,
           existingOrders || []
         );
+        mergedSnapshot = orderListSnapshot;
         this.logInfo("replaceOrdersSnapshotInSQLite-开始", {
           source,
           count: orderListSnapshot.length,
@@ -1226,6 +1313,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderList: remoteSnapshot.length
       });
     }
+    return mergedSnapshot;
   }
   /**
    * 清空订单模块的内存数据和本地 SQLite 订单表。

package/lib/server/modules/order/utils/filterOrders.js

@@ -335,8 +335,9 @@ function filterOrders(orders, filters) {
       }
     }
     if (safeFilters.start_time || safeFilters.end_time) {
+      const isCreatedIsUndefined = order.created_at === void 0;
       const orderTime = order.created_at ? typeof order.created_at === "number" ? order.created_at : (0, import_dayjs.default)(String(order.created_at)).valueOf() : 0;
-      if (safeFilters.start_time) {
+      if (safeFilters.start_time && !isCreatedIsUndefined) {
         const startTs = (0, import_dayjs.default)(safeFilters.start_time).startOf("day").valueOf();
         if (orderTime < startTs) {
           rejected.push({
@@ -351,7 +352,7 @@ function filterOrders(orders, filters) {
           return false;
         }
       }
-      if (safeFilters.end_time) {
+      if (safeFilters.end_time && !isCreatedIsUndefined) {
         const endTs = (0, import_dayjs.default)(safeFilters.end_time).endOf("day").valueOf();
         if (orderTime > endTs) {
           rejected.push({