@pisell/pisellos 2.2.264 → 2.2.265

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

@@ -2,6 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../../types';
 import { BaseModule } from '../../../modules/BaseModule';
 import type { RouteDefinition } from '../../types';
 import { OrderData, OrderId } from './types';
+import { type OrderPaymentIdentityType } from '../../../modules/Order/payment-utils';
 /**
  * Order 模块 - 基础框架
  */
@@ -43,6 +44,16 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private logError;
     private logWarning;
+    /**
+     * 在订单进入内存或 SQLite 前统一压缩子项强身份重复并补齐协议 UID。
+     * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
+     */
+    private normalizeOrderCollectionsForIngress;
+    /**
+     * incoming 决定权威成员集合；同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
+     */
+    private mergeAuthoritativeOrderCollection;
+    private reconcileOverwriteOrderCollections;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -79,8 +90,31 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderById(id: OrderId): OrderData | undefined;
     /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
+    private buildLocalPaymentOrderLogContext;
     getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
-    getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
+    getLocalOrderByLookup(lookup: OrderId, options?: {
+        operationId?: string;
+    }): Promise<OrderData | null>;
+    getLocalPayment(params: {
+        saleId: OrderId;
+        paymentNumber: OrderId;
+        operationId?: string;
+    }): Promise<{
+        order: OrderData;
+        payment: Record<string, any>;
+        paymentIndex: number;
+        matchedBy: OrderPaymentIdentityType;
+    } | null>;
+    updateLocalPayment(params: {
+        saleId: OrderId;
+        paymentNumber: OrderId;
+        operationId?: string;
+        updates: Record<string, any>;
+    }): Promise<{
+        order: OrderData;
+        payment: Record<string, any>;
+        previousPayment: Record<string, any>;
+    } | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -89,6 +123,10 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     silentRefresh(): Promise<OrderData[]>;
     private normalizeOrderForMemoryList;
+    private normalizeOrdersForMemoryList;
+    private hasRealOrderId;
+    private shouldKeepOrderInMemory;
+    private withoutSyntheticDraftOrderId;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
      * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -100,7 +138,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
      * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
      */
-    upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
+    upsertOrdersFromRemote(freshOrders: OrderData[], source?: string): Promise<void>;
     markOrderSyncedByExternalSaleNumber(params: {
         externalSaleNumber: OrderId;
         patch?: Partial<OrderData>;
@@ -112,7 +150,14 @@ export declare class OrderModule extends BaseModule implements Module {
      * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
      * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
      */
-    upsertPendingSyncOrders(pendingOrders: OrderData[]): Promise<void>;
+    upsertPendingSyncOrders(pendingOrders: OrderData[], options?: {
+        throwOnError?: boolean;
+    }): Promise<void>;
+    /**
+     * 将 POS 草稿订单按 SQLite storage key 落库。
+     * 只有具备真实 order_id 的草稿进入 store；其余草稿仅供本地恢复查询。
+     */
+    upsertLocalDraftOrders(draftOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -214,8 +259,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private pickPreferredOrder;
     private getProductIdentityKeys;
     private mergeOrderProductLists;
-    private getPaymentMergeKey;
     private mergeOrderPaymentLists;
+    private getIdentifiedPendingPayments;
+    private shouldProtectLocalOrderFromRemoteSnapshot;
+    private getUnmatchedIdentifiedPendingPayments;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;
@@ -232,7 +279,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private setStorageItem;
     private loadOrdersFromSQLite;
     private isPendingSyncOrder;
+    private isDraftOrder;
+    private shouldProtectDraftOrderFromIncoming;
     private normalizeRemoteSyncedOrder;
+    private mergeRemoteIdentityIntoDraftOrder;
     private mergeRemoteSnapshotWithPendingOrders;
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
@@ -258,7 +308,8 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private updateOrderInSQLite;
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync / pending 支付订单。
+     * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
      * await this.replaceOrdersSnapshotInSQLite(orderList)