@pisell/pisellos 2.2.244 → 2.2.245

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

@@ -16,6 +16,8 @@ export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
 export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, } from './order/types';
 export { OrderHooks } from './order/types';
+export { PaymentServerModule } from './payment';
+export type { PaymentMethod, PaymentMethodsChangedEventData, PaymentServerState } from './payment/types';
 export { FloorPlanModule } from './floor-plan';
 export type { FloorPlanItem, FloorPlanState, FloorPlanSyncMessage } from './floor-plan/types';
 export { FloorPlanHooks } from './floor-plan/types';

package/lib/server/modules/index.js

@@ -25,6 +25,7 @@ __export(modules_exports, {
   MenuModule: () => import_menu.MenuModule,
   OrderHooks: () => import_types4.OrderHooks,
   OrderModule: () => import_order.OrderModule,
+  PaymentServerModule: () => import_payment.PaymentServerModule,
   ProductsHooks: () => import_types.ProductsHooks,
   ProductsModule: () => import_products.ProductsModule,
   QuotationHooks: () => import_types3.QuotationHooks,
@@ -44,6 +45,7 @@ var import_types3 = require("./quotation/types");
 var import_schedule = require("./schedule");
 var import_order = require("./order");
 var import_types4 = require("./order/types");
+var import_payment = require("./payment");
 var import_floor_plan = require("./floor-plan");
 var import_types5 = require("./floor-plan/types");
 var import_resource = require("./resource");
@@ -56,6 +58,7 @@ var import_resource2 = require("./resource");
   MenuModule,
   OrderHooks,
   OrderModule,
+  PaymentServerModule,
   ProductsHooks,
   ProductsModule,
   QuotationHooks,

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

@@ -18,7 +18,18 @@ export declare class OrderModule extends BaseModule implements Module {
     private resourceIdIndex;
     private logger;
     private storage;
+    private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
+    private recentSqliteWriteByStorageKey;
+    /** 最近一次 SSE 全量拉取完成时间 */
+    private lastServerFullFetchAtMs;
     constructor(name?: string, version?: string);
+    /**
+     * 广播订单变更事件，兼容全量列表订阅并额外携带本次变更订单。
+     *
+     * @example
+     * await this.emitOrdersChanged([freshOrder], 'pubsub.bodyUpsert')
+     */
+    private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
    * 记录信息日志
@@ -32,14 +43,45 @@ export declare class OrderModule extends BaseModule implements Module {
      * @param metadata 日志元数据
      */
     private logError;
+    private logWarning;
+    /**
+     * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
+     *
+     * @example
+     * this.recordRecentSqliteWrite('upsertOrdersFromRemote', orders)
+     */
+    private recordRecentSqliteWrite;
+    /**
+     * 过滤 pubsub 触发的冗余 SQLite patch（业务 API 刚写入过的 update 回声）。
+     *
+     * @example
+     * const { toWrite, skipped } = this.filterRedundantPatchOrders('pubsub.bodyUpsert', orders, mergeActions)
+     */
+    private filterRedundantPatchOrders;
+    /**
+     * 过滤 pubsub HTTP 增量拉取 ids：本地刚由业务 API 写入的单可跳过 HTTP。
+     *
+     * @example
+     * const ids = this.filterRedundantHttpRefreshIds([99331, 99332])
+     */
+    private filterRedundantHttpRefreshIds;
+    /**
+     * 解析 pubsub 消息会走哪条同步分支，便于对照为何触发 HTTP 重拉或 body 直写。
+     *
+     * @example
+     * this.resolveSyncMessageRoute(msg)
+     * // => { route: 'httpRefresh.batchIds', ... }
+     */
+    private resolveSyncMessageRoute;
     private updateCreateStore;
     private getOrderSyncThrottleMs;
     preload(): Promise<void>;
     getOrders(): OrderData[];
     getOrderById(id: OrderId): OrderData | undefined;
-    /** 按 order_id 查询（推荐） */
+    /** 按 order_id 查询内存订单。 */
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
-    getLocalOrderByOrderId(orderId: OrderId): Promise<OrderData | null>;
+    getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
+    getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
@@ -48,6 +90,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     silentRefresh(): Promise<OrderData[]>;
     getOrdersByResourceId(resourceId: string | number): OrderData[];
+    private normalizeOrderForMemoryList;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
      * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
@@ -60,6 +103,18 @@ 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。
+     */
+    upsertPendingSyncOrders(pendingOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -67,6 +122,10 @@ export declare class OrderModule extends BaseModule implements Module {
     getRoutes(): RouteDefinition[];
     destroy(): void;
     private syncOrdersMap;
+    private getOrderMapKey;
+    private isBlankIdentityValue;
+    private getOrderIdentityEntries;
+    private getOrderIdentityKeys;
     private extractResourceIds;
     private getOrderDateKey;
     /**
@@ -120,6 +179,26 @@ export declare class OrderModule extends BaseModule implements Module {
     private normalizeOrderSyncPayload;
     private uniqueOrderIds;
     private getIdKey;
+    private isOrderLookupMatch;
+    /**
+     * 解析订单 SQLite 主键，规则与宿主 OrderDataSource.getOrderStorageKey 一致。
+     *
+     * @example
+     * const key = this.getOrderStorageKey({ order_id: 1001, external_sale_number: 'S-1001' })
+     * // => 'S-1001'
+     */
+    private getOrderStorageKey;
+    private getOrderIdentityMatchKeys;
+    private doOrdersShareIdentity;
+    private findOrderIndexByIdentity;
+    private getOrderCompletenessScore;
+    private pickPreferredOrder;
+    private getProductMergeKey;
+    private mergeOrderProductLists;
+    private mergeOrderRecords;
+    private summarizeDuplicateOrders;
+    private logDuplicateOrders;
+    private compactOrderListByIdentity;
     /**
      * 当前订单拉取窗口：
      * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
@@ -131,6 +210,44 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
-    private saveOrdersToSQLite;
+    private isPendingSyncOrder;
+    private normalizeRemoteSyncedOrder;
+    private mergeRemoteSnapshotWithPendingOrders;
+    /**
+     * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
+     *
+     * @example
+     * await this.runInOrderSQLiteSaveQueue(async () => {
+     *   await this.dbManager.bulkUpdate(INDEXDB_STORE_NAME, orders)
+     * })
+     */
+    private runInOrderSQLiteSaveQueue;
+    /**
+     * 批量增量 upsert 订单到 SQLite，不清空表；用于 pubsub / HTTP 增量合并。
+     *
+     * @example
+     * await this.patchOrdersInSQLite(freshOrders)
+     */
+    private patchOrdersInSQLite;
+    /**
+     * 单条 upsert 订单到 SQLite；用于 overwriteExistingOrder 等单条覆盖场景。
+     *
+     * @example
+     * await this.updateOrderInSQLite(freshOrder)
+     */
+    private updateOrderInSQLite;
+    /**
+     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
+     *
+     * @example
+     * await this.replaceOrdersSnapshotInSQLite(orderList)
+     */
+    private replaceOrdersSnapshotInSQLite;
+    /**
+     * 清空订单模块的内存数据和本地 SQLite 订单表。
+     *
+     * @example
+     * await orderModule.clear()
+     */
     clear(): Promise<void>;
 }