@pisell/pisellos 0.0.567 → 0.0.569

package/dist/server/modules/floor-plan/types.d.ts

@@ -0,0 +1,43 @@
+/**
+ * 平面图（floor-plan）Server 模块类型
+ * 与 GET /shop/schedule/floor-plan 系列接口数据结构对齐
+ */
+export interface FloorPlanItem {
+    id: number;
+    shop_id?: number;
+    code: string;
+    name: string | Record<string, string>;
+    layout: unknown[];
+    canvas_width: number;
+    canvas_height: number;
+    sort: number;
+    status: number;
+    created_at?: string;
+    updated_at?: string;
+}
+export interface FloorPlanState {
+    list: FloorPlanItem[];
+    map: Map<string, FloorPlanItem>;
+    codeMap: Map<string, FloorPlanItem>;
+}
+/** pubsub / Ably 推送消息（与《平面图编辑器API文档》Socket 一节一致） */
+export interface FloorPlanSyncMessage {
+    module?: string;
+    action?: string;
+    operation?: string;
+    id?: number;
+    ids?: number[];
+    body?: Partial<FloorPlanItem> & {
+        id?: number;
+    };
+    message_uuid?: string;
+    timestamp?: string;
+    _channelKey?: string;
+}
+export declare const FloorPlanHooks: {
+    /** 本地列表变更（预加载、合并、删除后） */
+    readonly onFloorPlansChanged: "server_floor_plan:onFloorPlansChanged";
+    /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+    readonly onFloorPlanSyncCompleted: "server_floor_plan:onFloorPlanSyncCompleted";
+};
+export type FloorPlanHooksType = (typeof FloorPlanHooks)[keyof typeof FloorPlanHooks];

package/dist/server/modules/floor-plan/types.js

@@ -0,0 +1,13 @@
+/**
+ * 平面图（floor-plan）Server 模块类型
+ * 与 GET /shop/schedule/floor-plan 系列接口数据结构对齐
+ */
+
+/** pubsub / Ably 推送消息（与《平面图编辑器API文档》Socket 一节一致） */
+
+export var FloorPlanHooks = {
+  /** 本地列表变更（预加载、合并、删除后） */
+  onFloorPlansChanged: 'server_floor_plan:onFloorPlansChanged',
+  /** pubsub 同步处理完成，供 Server 向订阅者推送最新查询结果 */
+  onFloorPlanSyncCompleted: 'server_floor_plan:onFloorPlanSyncCompleted'
+};

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

@@ -3,7 +3,7 @@
  * 包含新增的 Products、Menu、Quotation 和扩展的 Schedule 模块
  */
 export { ProductsModule } from './products';
-export type { ProductsState } from './products/types';
+export type { ProductIdScope, ProductsState } from './products/types';
 export { ProductsHooks } from './products/types';
 export { MenuModule } from './menu';
 export type { MenuState, MenuData } from './menu/types';
@@ -14,8 +14,13 @@ export { QuotationHooks } from './quotation/types';
 export { ScheduleModuleEx } from './schedule';
 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, BookingFilterResult, OrderModulePagedResult, } from './order/types';
+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';
 export { ResourceModule, resourceModule } from './resource';
 export type { ResourceState, ResourceData, ResourceId, ResourceBooking, ResourcePageQuery, ResourcePageResult, QueryOptions, ScheduleEventResource, } from './resource';
 export { ResourceHooks } from './resource';

package/dist/server/modules/index.js

@@ -21,6 +21,12 @@ export { ScheduleModuleEx } from "./schedule";
 export { OrderModule } from "./order";
 export { OrderHooks } from "./order/types";
 
+// Payment 模块
+export { PaymentServerModule } from "./payment";
+// 平面图（floor-plan）
+export { FloorPlanModule } from "./floor-plan";
+export { FloorPlanHooks } from "./floor-plan/types";
+
 // Resource 模块
 export { ResourceModule, resourceModule } from "./resource";
 export { ResourceHooks } from "./resource";

package/dist/server/modules/menu/index.js

@@ -84,9 +84,7 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
                 app = appPlugin.getApp();
                 this.dbManager = app.dbManager;
                 this.logger = app.logger;
-                if (this.dbManager) {
-                  console.log('[Menu] IndexDB Manager 已初始化');
-                } else {
+                if (this.dbManager) {} else {
                   console.warn('[Menu] IndexDB Manager 未找到');
                 }
               }
@@ -262,7 +260,6 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
       } finally {
         _iterator2.f();
       }
-      console.log("[Menu] Map \u7F13\u5B58\u5DF2\u540C\u6B65\uFF0C\u5171 ".concat(this.store.map.size, " \u4E2A\u9910\u724C"));
     }
 
     /**
@@ -285,33 +282,31 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
 
               // 同时清空 IndexDB 中的数据
               if (!this.dbManager) {
-                _context4.next = 17;
+                _context4.next = 16;
                 break;
               }
               _context4.prev = 5;
               _context4.next = 8;
               return this.dbManager.clear(INDEXDB_STORE_NAME);
             case 8:
-              console.log('[Menu] IndexDB 缓存已清空');
               this.logInfo('IndexDB 缓存已清空');
-              _context4.next = 17;
+              _context4.next = 16;
               break;
-            case 12:
-              _context4.prev = 12;
+            case 11:
+              _context4.prev = 11;
               _context4.t0 = _context4["catch"](5);
               errorMessage = _context4.t0 instanceof Error ? _context4.t0.message : String(_context4.t0);
               console.error('[Menu] 清空 IndexDB 缓存失败:', _context4.t0);
               this.logError('清空 IndexDB 缓存失败', {
                 error: errorMessage
               });
-            case 17:
-              console.log('[Menu] 缓存已清空');
+            case 16:
               this.logInfo('缓存清空完成');
-            case 19:
+            case 17:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[5, 12]]);
+        }, _callee4, this, [[5, 11]]);
       }));
       function clear() {
         return _clear.apply(this, arguments);
@@ -402,14 +397,13 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
               _context6.next = 10;
               return Promise.all(savePromises);
             case 10:
-              console.log("[Menu] \u5DF2\u5C06 ".concat(menuList.length, " \u6761\u9910\u724C\u6570\u636E\u4FDD\u5B58\u5230 IndexDB"));
               this.logInfo('餐牌数据已保存到 IndexDB', {
                 menuCount: menuList.length
               });
-              _context6.next = 19;
+              _context6.next = 18;
               break;
-            case 14:
-              _context6.prev = 14;
+            case 13:
+              _context6.prev = 13;
               _context6.t0 = _context6["catch"](4);
               errorMessage = _context6.t0 instanceof Error ? _context6.t0.message : String(_context6.t0);
               console.error('[Menu] 保存数据到 IndexDB 失败:', _context6.t0);
@@ -417,11 +411,11 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
                 menuCount: menuList.length,
                 error: errorMessage
               });
-            case 19:
+            case 18:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[4, 14]]);
+        }, _callee6, this, [[4, 13]]);
       }));
       function saveMenuToIndexDB(_x4) {
         return _saveMenuToIndexDB.apply(this, arguments);
@@ -441,19 +435,17 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              console.log('[Menu] 开始预加载数据...');
               startTime = Date.now();
               this.logInfo('开始预加载数据');
-              _context7.prev = 3;
-              _context7.next = 6;
+              _context7.prev = 2;
+              _context7.next = 5;
               return this.loadMenuFromIndexDB();
-            case 6:
+            case 5:
               cachedData = _context7.sent;
               if (!(cachedData && cachedData.length > 0)) {
-                _context7.next = 15;
+                _context7.next = 13;
                 break;
               }
-              console.log("[Menu] \u4ECE IndexDB \u52A0\u8F7D\u4E86 ".concat(cachedData.length, " \u6761\u9910\u724C\u6570\u636E"));
               // 将缓存数据放入 store
               this.store.menuList = cloneDeep(cachedData);
               // 同步更新 Map 缓存
@@ -466,31 +458,30 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
                 source: 'IndexDB'
               });
               return _context7.abrupt("return");
-            case 15:
-              console.log('[Menu] IndexDB 中没有缓存数据，从服务器加载...');
+            case 13:
               this.logInfo('IndexDB 中没有缓存数据，准备从服务器加载');
-              _context7.next = 24;
+              _context7.next = 21;
               break;
-            case 19:
-              _context7.prev = 19;
-              _context7.t0 = _context7["catch"](3);
+            case 16:
+              _context7.prev = 16;
+              _context7.t0 = _context7["catch"](2);
               errorMessage = _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0);
               console.warn('[Menu] 从 IndexDB 加载数据失败:', _context7.t0);
               this.logWarning('从 IndexDB 加载数据失败，准备从服务器加载', {
                 error: errorMessage
               });
-            case 24:
-              _context7.next = 26;
+            case 21:
+              _context7.next = 23;
               return this.loadMenuList();
-            case 26:
+            case 23:
               menuList = _context7.sent;
               if (!(menuList && menuList.length > 0)) {
-                _context7.next = 37;
+                _context7.next = 34;
                 break;
               }
-              _context7.next = 30;
+              _context7.next = 27;
               return this.saveMenuToIndexDB(menuList);
-            case 30:
+            case 27:
               this.store.menuList = cloneDeep(menuList);
               // 同步更新 Map 缓存
               this.syncMenuMap();
@@ -501,18 +492,18 @@ export var MenuModule = /*#__PURE__*/function (_BaseModule) {
                 duration: "".concat(_duration2, "ms"),
                 source: 'Server'
               });
-              _context7.next = 39;
+              _context7.next = 36;
               break;
-            case 37:
+            case 34:
               _duration3 = Date.now() - startTime;
               this.logWarning('预加载完成但未获取到数据', {
                 duration: "".concat(_duration3, "ms")
               });
-            case 39:
+            case 36:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[3, 19]]);
+        }, _callee7, this, [[2, 16]]);
       }));
       function preload() {
         return _preload.apply(this, arguments);

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

@@ -13,17 +13,28 @@ export declare class OrderModule extends BaseModule implements Module {
     private orderDataSource;
     private pendingSyncMessages;
     private syncTimer?;
-    private readonly ORDER_SYNC_DEBOUNCE_MS;
-    private resourceIdIndex;
+    private isProcessingSyncBatch;
+    private isIdlePhase;
     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>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志
@@ -31,46 +42,190 @@ export declare class OrderModule extends BaseModule implements Module {
      * @param metadata 日志元数据
      */
     private logError;
+    private logWarning;
+    /**
+     * 在订单进入内存或 SQLite 前统一压缩子项强身份重复并补齐协议 UID。
+     * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
+     */
+    private normalizeOrderCollectionsForIngress;
+    /**
+     * incoming 决定权威成员集合；同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
+     */
+    private mergeAuthoritativeOrderCollection;
+    private reconcileOverwriteOrderCollections;
+    /**
+     * 记录订单最近一次 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;
+    getLocalOrderFromMemoryByLookup(lookup: OrderId): OrderData | null;
+    getLocalOrderByLookup(lookup: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
-    getOrdersByResourceId(resourceId: string | number): OrderData[];
+    /**
+     * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
+     * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件
+     * @returns 刷新后的订单列表
+     */
+    silentRefresh(): Promise<OrderData[]>;
+    private normalizeOrderForMemoryList;
+    /**
+     * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
+     * 适用于"按 order_id 主动刷新本地订单详情"的代理场景。
+     */
+    overwriteExistingOrder(fresh: OrderData): Promise<{
+        overwritten: boolean;
+    }>;
+    /**
+     * 将远端拉取的订单合并进本地 store（已存在则更新，不存在则追加），落库并 emit onOrdersChanged。
+     * 供 /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 精简字段）
+     */
+    fetchOrdersBySSE(query?: Record<string, any>): Promise<OrderData[]>;
     getRoutes(): RouteDefinition[];
     destroy(): void;
     private syncOrdersMap;
-    private extractResourceIds;
+    private getOrderMapKey;
+    private isBlankIdentityValue;
+    private getOrderIdentityEntries;
+    private getOrderIdentityKeys;
     private getOrderDateKey;
     /**
      * 初始化 OrderDataSource 实例
      */
     private initOrderDataSource;
     /**
-     * 初始化 pubsub 订阅，监听订单变更
+     * 初始化 pubsub 订阅，监听订单变更（纯订阅，不拉数据；全量 SSE 由 loadOrdersByServer 负责）
      */
     private setupOrderSync;
     /**
-     * 处理防抖后的同步消息批次
+     * 调度订单同步节流窗口（leading-edge throttle）：
+     * - 空闲状态下收到的第一条消息立即触发批处理，无需等待；
+     * - 首条处理后进入冷却窗口，窗口期间的后续消息聚合，窗口结束后批量处理；
+     * - 若当前批处理执行中，则由批处理结束后决定是否开启下一轮窗口。
+     */
+    private scheduleOrderSyncThrottle;
+    /**
+     * 执行一次节流批处理并在需要时续约下一轮窗口。
+     * 批处理完成且无后续消息时恢复空闲状态，下一条消息将立即触发。
+     */
+    private flushOrderSyncMessagesByThrottle;
+    /**
+     * 处理节流窗口内聚合后的同步消息批次
      *
      * 后端统一发送 change 消息，不再区分新增/编辑/删除。
      * - 单条（id/order_id）：若携带 body/data 则直接 upsert 到本地
      * - 批量（ids）：通过 HTTP 按 ids 增量拉取，再 merge 到本地
+     *
+     * @example
+     * // pending 队列中存在 8 条消息时，仅处理一次批次并统一 merge
+     * await this.processOrderSyncMessages()
      */
     private processOrderSyncMessages;
     /**
-     * 通过 HTTP 按 ids 增量拉取订单
+     * 通过 HTTP 按 ids 批量拉取订单详情（走 orderDataSource）。
+     *
+     * - 优先使用 `orderDataSource.fetchOrdersByIds`（如适配器实现了该方法）
+     * - 否则回退到 `orderDataSource.run({ http: { query: { ids } } })`
+     * - 失败统一返回空数组（由调用方按"返回缺失的 id" 判断单笔失败）
+     *
+     * @example
+     * const fresh = await orderModule.fetchOrdersByHttp(['96971', '96972'])
      */
-    private fetchOrdersByHttp;
+    fetchOrdersByHttp(ids: OrderId[]): Promise<OrderData[]>;
     /**
      * 将增量订单合并到 store
      */
     private mergeOrdersToStore;
+    /**
+     * 在身份索引中查找与目标订单共享任一身份键的已存在订单下标。
+     * 返回所有命中键里最小的下标，等价于原 findOrderIndexByIdentity 的「取首个匹配」语义。
+     *
+     * @example
+     * const idx = this.lookupOrderIndexByIdentityKeys(identityKeyToIndex, freshIdentityKeys)
+     */
+    private lookupOrderIndexByIdentityKeys;
+    private isRemoteEchoMergeSource;
+    /**
+     * 将订单的全部身份键登记到索引并指向其在列表中的下标。
+     * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。
+     *
+     * @example
+     * this.registerOrderIdentityKeys(identityKeyToIndex, mergedOrder, matchIndex)
+     */
+    private registerOrderIdentityKeys;
+    /**
+     * 合并热路径去重兜底：默认直接返回原列表（增量索引已保证无重复）。
+     * 仅当 ORDER_MERGE_SELF_CHECK 开启时，额外做一次全表压缩并在发现残留重复时告警。
+     */
+    private runOrderStoreSelfCheck;
     private normalizeOrderSyncMessage;
     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 mergeOrderRecords;
+    private summarizeDuplicateOrders;
+    private logDuplicateOrders;
+    private compactOrderListByIdentity;
     /**
      * 当前订单拉取窗口：
      * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
@@ -82,6 +237,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>;
 }