@pisell/pisellos 2.3.73 → 2.3.74

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

@@ -9,6 +9,8 @@ export declare class QuotationModule extends BaseModule implements Module {
     private request;
     private store;
     private scheduleResolver?;
+    private app;
+    private quotationListUpdatedListener?;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
@@ -16,6 +18,7 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Promise<void>;
     getQuotationList(): QuotationItem[];
+    setQuotationListUpdatedListener(listener?: () => void): void;
     getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
     /**
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
@@ -60,6 +63,9 @@ export declare class QuotationModule extends BaseModule implements Module {
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
+    private applyQuotationResponse;
+    private notifyQuotationListUpdated;
+    private getQuotationCacheKeyData;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private normalizeCustomerId;

package/lib/modules/Quotation/index.js

@@ -32,32 +32,49 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
     this.store = { list: [] };
   }
   async initialize(core, options) {
+    var _a, _b;
     this.core = core;
     this.request = core.getPlugin("request");
     if (!this.request)
       throw new Error("QuotationModule 需要 request 插件支持");
+    this.app = (_b = (_a = core.getPlugin("app")) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a);
     this.store = { list: [] };
   }
   async loadQuotations(params) {
-    var _a;
     const query = {};
     if (params == null ? void 0 : params.channel)
       query.channel = params.channel;
     if ((params == null ? void 0 : params.channel) === "online_store") {
       query.channel = "online-store";
     }
+    let initialResultApplied = false;
+    const applyRemoteUpdate = (response) => {
+      this.applyQuotationResponse(response);
+      if (initialResultApplied) {
+        this.notifyQuotationListUpdated();
+      }
+    };
     const res = await this.request.get(
       "/quotation/available",
       query,
-      { useCache: false, osServer: true }
+      {
+        cache: {
+          type: "indexDB",
+          updateCache: true,
+          cacheKeyData: this.getQuotationCacheKeyData(query)
+        },
+        cacheUpdateChange: applyRemoteUpdate
+      }
     );
-    const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => b.sort - a.sort);
-    this.store.list = list;
+    this.applyQuotationResponse(res);
+    initialResultApplied = true;
   }
   getQuotationList() {
     return this.store.list;
   }
+  setQuotationListUpdatedListener(listener) {
+    this.quotationListUpdatedListener = listener;
+  }
   getQuotationCustomerScopeInfo() {
     const customerById = /* @__PURE__ */ new Map();
     const quotationScopes = this.store.list.filter((quotation) => Array.isArray(quotation.customer) && quotation.customer.length > 0).map((quotation) => {
@@ -156,6 +173,33 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
+  applyQuotationResponse(response) {
+    var _a;
+    const source = ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.list) || (response == null ? void 0 : response.list) || [];
+    this.store.list = [...source].sort((a, b) => Number(b.sort || 0) - Number(a.sort || 0));
+  }
+  notifyQuotationListUpdated() {
+    var _a;
+    try {
+      (_a = this.quotationListUpdatedListener) == null ? void 0 : _a.call(this);
+    } catch (error) {
+      console.warn("[QuotationModule] 报价单后台更新回调失败", error);
+    }
+  }
+  getQuotationCacheKeyData(query) {
+    var _a, _b, _c;
+    let shopId = "";
+    try {
+      const storedCore = (_c = (_b = (_a = this.app) == null ? void 0 : _a.storage) == null ? void 0 : _b.getStorage) == null ? void 0 : _c.call(_b, "core");
+      const coreInfo = typeof storedCore === "string" ? JSON.parse(storedCore || "{}") : storedCore || {};
+      shopId = String((coreInfo == null ? void 0 : coreInfo.id) || "");
+    } catch {
+    }
+    return {
+      ...query,
+      shop_id: shopId
+    };
+  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0)

package/lib/plugins/request.d.ts

@@ -68,6 +68,7 @@ export interface RequestOptions {
     useCache?: boolean;
     customToast?: () => void;
     cache?: CacheProps;
+    cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;

package/lib/server/index.d.ts

@@ -51,6 +51,8 @@ declare class Server {
     private productQueryScheduleTimers;
     /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
     private menuScheduleRefreshInFlight;
+    /** 启动阶段模块预加载任务；预渲染商品查询复用该任务，避免缓存尚未 ready 时误触发远端自愈。 */
+    private startupModulePreloadInFlight;
     private lastMenuScheduleRefreshAt;
     private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
@@ -157,13 +159,17 @@ declare class Server {
      * 重新拉取全量 SSE 接口，更新本地数据后触发 onProductsSyncCompleted
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
-    refreshProductsInBackground(): Promise<void>;
+    refreshProductsInBackground(options?: {
+        trigger?: string;
+    }): Promise<void>;
     /**
      * 后台静默刷新订单数据
      * 重新拉取全量 SSE 接口，更新本地数据后触发 onOrdersSyncCompleted
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
-    refreshOrdersInBackground(): Promise<void>;
+    refreshOrdersInBackground(options?: {
+        trigger?: string;
+    }): Promise<void>;
     /**
      * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
      * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，

package/lib/server/index.js

@@ -86,6 +86,8 @@ var Server = class {
     this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
     /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
     this.menuScheduleRefreshInFlight = null;
+    /** 启动阶段模块预加载任务；预渲染商品查询复用该任务，避免缓存尚未 ready 时误触发远端自愈。 */
+    this.startupModulePreloadInFlight = null;
     this.lastMenuScheduleRefreshAt = 0;
     this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS = 30 * 1e3;
     // ---- 订单 / 预约列表查询订阅者 ----
@@ -1383,7 +1385,15 @@ var Server = class {
     this.registerDeviceTaskActions();
     const registeredModules = await this.registerModules(moduleConfigs);
     if (autoPreload) {
-      await this.preloadModulesData(registeredModules, options);
+      const preloadTask = this.preloadModulesData(registeredModules, options);
+      this.startupModulePreloadInFlight = preloadTask;
+      try {
+        await preloadTask;
+      } finally {
+        if (this.startupModulePreloadInFlight === preloadTask) {
+          this.startupModulePreloadInFlight = null;
+        }
+      }
     } else {
       this.logInfo("跳过自动预加载", { autoPreload });
     }
@@ -1688,11 +1698,22 @@ var Server = class {
       return;
     }
     try {
-      await this.schedule.loadAllSchedule();
       this.products.clearPriceCache();
       await this.products.setupQuotationPriceBridge({
         scheduleModule: this.schedule,
-        channel: (_a = this.core.context) == null ? void 0 : _a.channel
+        channel: (_a = this.core.context) == null ? void 0 : _a.channel,
+        onQuotationUpdated: () => {
+          void this.recomputeAndNotifyProductQuery();
+        }
+      });
+      void this.schedule.loadAllSchedule().then(() => {
+        var _a2;
+        (_a2 = this.products) == null ? void 0 : _a2.clearPriceCache();
+        void this.recomputeAndNotifyProductQuery();
+      }).catch((error) => {
+        this.logWarning("Products 报价单价格桥接后台刷新 Schedule 失败，继续使用本地数据", {
+          error: error instanceof Error ? error.message : String(error)
+        });
       });
       this.logInfo("Products 报价单价格桥接初始化完成");
     } catch (error) {
@@ -1750,22 +1771,27 @@ var Server = class {
    * 重新拉取全量 SSE 接口，更新本地数据后触发 onProductsSyncCompleted
    * 不影响当前界面展示，适用于切回前台、定时刷新等场景
    */
-  async refreshProductsInBackground() {
+  async refreshProductsInBackground(options = {}) {
     if (!this.products) {
       this.logWarning("refreshProductsInBackground: Products 模块未注册");
       return;
     }
-    this.logInfo("refreshProductsInBackground 开始");
+    const trigger = options.trigger || "background";
+    this.logInfo("refreshProductsInBackground 开始", { trigger });
     const startTime = Date.now();
     try {
-      await this.products.silentRefresh();
+      await this.products.silentRefresh({ trigger });
       const duration = Date.now() - startTime;
-      this.logInfo("refreshProductsInBackground 完成", { duration: `${duration}ms` });
+      this.logInfo("refreshProductsInBackground 完成", {
+        trigger,
+        duration: `${duration}ms`
+      });
     } catch (error) {
       const duration = Date.now() - startTime;
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Server] refreshProductsInBackground 失败:", error);
       this.logError("refreshProductsInBackground 失败", {
+        trigger,
         duration: `${duration}ms`,
         error: errorMessage
       });
@@ -1776,22 +1802,27 @@ var Server = class {
    * 重新拉取全量 SSE 接口，更新本地数据后触发 onOrdersSyncCompleted
    * 不影响当前界面展示，适用于切回前台、定时刷新等场景
    */
-  async refreshOrdersInBackground() {
+  async refreshOrdersInBackground(options = {}) {
     if (!this.order) {
       this.logWarning("refreshOrdersInBackground: Order 模块未注册");
       return;
     }
-    this.logInfo("refreshOrdersInBackground 开始");
+    const trigger = options.trigger || "background";
+    this.logInfo("refreshOrdersInBackground 开始", { trigger });
     const startTime = Date.now();
     try {
-      await this.order.silentRefresh();
+      await this.order.silentRefresh({ trigger });
       const duration = Date.now() - startTime;
-      this.logInfo("refreshOrdersInBackground 完成", { duration: `${duration}ms` });
+      this.logInfo("refreshOrdersInBackground 完成", {
+        trigger,
+        duration: `${duration}ms`
+      });
     } catch (error) {
       const duration = Date.now() - startTime;
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Server] refreshOrdersInBackground 失败:", error);
       this.logError("refreshOrdersInBackground 失败", {
+        trigger,
         duration: `${duration}ms`,
         error: errorMessage
       });
@@ -5079,12 +5110,6 @@ var Server = class {
     const tTotal = performance.now();
     const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id, strategy_context } = context;
     const queryIds = Array.isArray(ids) ? ids.map((id) => Number(id)).filter((id) => Number.isFinite(id)) : [];
-    const formatterContext = this.buildProductFormatterContext({
-      schedule_date,
-      schedule_datetime,
-      customer_id,
-      strategy_context
-    });
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       ids: queryIds,
@@ -5096,6 +5121,16 @@ var Server = class {
       strategyContextKeys: strategy_context ? Object.keys(strategy_context) : [],
       changedIds: options == null ? void 0 : options.changedIds
     });
+    const startupPreloadTask = this.startupModulePreloadInFlight;
+    if (startupPreloadTask) {
+      await startupPreloadTask;
+    }
+    const formatterContext = this.buildProductFormatterContext({
+      schedule_date,
+      schedule_datetime,
+      customer_id,
+      strategy_context
+    });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
       return { message: "Products 模块未注册", data: this.buildProductQueryResultPayload([], 0) };

package/lib/server/modules/floor-plan/index.d.ts

@@ -10,6 +10,7 @@ export declare class FloorPlanModule extends BaseModule implements Module {
     private store;
     private request;
     private logger;
+    private dbManager;
     private floorPlanDataSource;
     private pendingSyncMessages;
     private syncTimer?;
@@ -28,6 +29,9 @@ export declare class FloorPlanModule extends BaseModule implements Module {
     private mergeItems;
     private removeByIds;
     private loadListFromServer;
+    private loadListFromSQLite;
+    private saveListToSQLite;
+    private refreshListFromServer;
     fetchByIdFromServer(id: number | string): Promise<FloorPlanItem | null>;
     fetchByCodeFromServer(code: string): Promise<FloorPlanItem | null>;
     preload(): Promise<void>;

package/lib/server/modules/floor-plan/index.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(floor_plan_exports);
 var import_BaseModule = require("../../../modules/BaseModule");
 var import_types = require("./types");
 var FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3e3;
+var FLOOR_PLAN_STORE_NAME = "floor_plans";
 var FloorPlanModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -50,6 +51,7 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
     if (appPlugin) {
       const app = appPlugin.getApp();
       this.logger = app.logger;
+      this.dbManager = app.sqlite || app.dbManager;
     }
     this.initFloorPlanDataSource();
     this.setupFloorPlanSync();
@@ -159,6 +161,45 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
       return [];
     }
   }
+  async loadListFromSQLite() {
+    if (!this.dbManager)
+      return [];
+    try {
+      const list = await this.dbManager.getAll(FLOOR_PLAN_STORE_NAME);
+      return Array.isArray(list) ? list : [];
+    } catch (error) {
+      this.logWarning("从 SQLite 读取平面图失败", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return [];
+    }
+  }
+  async saveListToSQLite(list) {
+    if (!this.dbManager)
+      return;
+    try {
+      await this.dbManager.clear(FLOOR_PLAN_STORE_NAME);
+      if (list.length > 0) {
+        await this.dbManager.bulkAdd(FLOOR_PLAN_STORE_NAME, list);
+      }
+    } catch (error) {
+      this.logWarning("保存平面图到 SQLite 失败", {
+        count: list.length,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  async refreshListFromServer() {
+    const list = await this.loadListFromServer();
+    if (list.length === 0) {
+      this.logWarning("远端平面图刷新完成但列表为空");
+      return;
+    }
+    this.replaceStore(list);
+    await this.saveListToSQLite(list);
+    this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
+    this.logInfo("远端平面图刷新完成", { count: list.length });
+  }
   async fetchByIdFromServer(id) {
     try {
       const res = await this.request.get(
@@ -190,14 +231,19 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
   }
   async preload() {
     this.logInfo("开始预加载平面图列表");
-    const list = await this.loadListFromServer();
-    if (list.length > 0) {
-      this.replaceStore(list);
+    const cachedList = await this.loadListFromSQLite();
+    if (cachedList.length > 0) {
+      this.replaceStore(cachedList);
       this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
-      this.logInfo("预加载完成", { count: list.length });
-    } else {
-      this.logWarning("预加载完成但列表为空");
+      this.logInfo("预加载完成（SQLite）", { count: cachedList.length });
+      void this.refreshListFromServer().catch((error) => {
+        this.logWarning("后台刷新平面图失败，继续使用本地数据", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
+      return;
     }
+    await this.refreshListFromServer();
   }
   initFloorPlanDataSource() {
     var _a, _b;
@@ -299,6 +345,7 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
       }
     }
     if (changed) {
+      await this.saveListToSQLite(this.store.list);
       this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlansChanged, this.getSortedList());
       this.core.effects.emit(import_types.FloorPlanHooks.onFloorPlanSyncCompleted, null);
     }
@@ -307,6 +354,7 @@ var FloorPlanModule = class extends import_BaseModule.BaseModule {
     this.store.list = [];
     this.store.map.clear();
     this.store.codeMap.clear();
+    await this.saveListToSQLite([]);
   }
   destroy() {
     var _a;

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

@@ -185,16 +185,21 @@ var MenuModule = class extends import_BaseModule.BaseModule {
       this.logWarning("loadMenuFromIndexDB: dbManager 不可用");
       return [];
     }
+    const startedAt = performance.now();
     try {
       const menuList = await this.dbManager.getAll(INDEXDB_STORE_NAME);
       this.logInfo("从 IndexDB 加载餐牌数据", {
-        menuCount: (menuList == null ? void 0 : menuList.length) ?? 0
+        menuCount: (menuList == null ? void 0 : menuList.length) ?? 0,
+        durationMs: +(performance.now() - startedAt).toFixed(2)
       });
       return menuList || [];
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Menu] 从 IndexDB 读取数据失败:", error);
-      this.logError("从 IndexDB 读取数据失败", { error: errorMessage });
+      this.logError("从 IndexDB 读取数据失败", {
+        durationMs: +(performance.now() - startedAt).toFixed(2),
+        error: errorMessage
+      });
       return [];
     }
   }
@@ -207,20 +212,41 @@ var MenuModule = class extends import_BaseModule.BaseModule {
       this.logWarning("saveMenuToIndexDB: dbManager 不可用");
       return;
     }
+    const startedAt = performance.now();
+    let clearDurationMs = 0;
+    let writeDurationMs = 0;
     this.logInfo("开始保存餐牌数据到 IndexDB", { menuCount: menuList.length });
     try {
-      await this.dbManager.clear(INDEXDB_STORE_NAME);
+      const clearStartedAt = performance.now();
+      try {
+        await this.dbManager.clear(INDEXDB_STORE_NAME);
+      } finally {
+        clearDurationMs = +(performance.now() - clearStartedAt).toFixed(2);
+      }
+      const writeStartedAt = performance.now();
       const savePromises = menuList.map(
         (menu) => this.dbManager.add(INDEXDB_STORE_NAME, menu)
       );
-      await Promise.all(savePromises);
+      try {
+        await Promise.all(savePromises);
+      } finally {
+        writeDurationMs = +(performance.now() - writeStartedAt).toFixed(2);
+      }
       console.log(`[Menu] 已将 ${menuList.length} 条餐牌数据保存到 IndexDB`);
-      this.logInfo("餐牌数据已保存到 IndexDB", { menuCount: menuList.length });
+      this.logInfo("餐牌数据已保存到 IndexDB", {
+        menuCount: menuList.length,
+        clearDurationMs,
+        writeDurationMs,
+        totalDurationMs: +(performance.now() - startedAt).toFixed(2)
+      });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       console.error("[Menu] 保存数据到 IndexDB 失败:", error);
       this.logError("保存数据到 IndexDB 失败", {
         menuCount: menuList.length,
+        clearDurationMs,
+        writeDurationMs,
+        totalDurationMs: +(performance.now() - startedAt).toFixed(2),
         error: errorMessage
       });
     }

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

@@ -119,14 +119,23 @@ export declare class OrderModule extends BaseModule implements Module {
         payment: Record<string, any>;
         previousPayment: Record<string, any>;
     } | null>;
-    loadOrdersByServer(): Promise<OrderData[]>;
+    loadOrdersByServer(options?: {
+        trigger?: string;
+    }): Promise<OrderData[]>;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
      * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件
      * @returns 刷新后的订单列表
      */
-    silentRefresh(): Promise<OrderData[]>;
+    silentRefresh(options?: {
+        trigger?: string;
+    }): Promise<OrderData[]>;
     private normalizeOrderForMemoryList;
+    /**
+     * 将已经完成集合规范化的订单转换为内存身份，不重复扫描 products/bookings/payments。
+     */
+    private prepareNormalizedOrderForMemoryList;
+    private prepareNormalizedOrdersForMemoryList;
     private normalizeOrdersForMemoryList;
     private hasRealOrderId;
     private shouldKeepOrderInMemory;
@@ -291,13 +300,14 @@ export declare class OrderModule extends BaseModule implements Module {
     private logDuplicateOrders;
     private compactOrderListByIdentity;
     /**
-     * 当前订单拉取窗口：
-     * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
-     * - 无法解析时退化为自然日窗口
+     * 当前订单缓存可复用窗口。
+     * start_time 模式使用精确的营业日起止时间；配置缺失或异常时退化为自然日。
      */
-    private getCurrentPullWindow;
+    private getCurrentOrderCacheWindow;
     private hasPulledOrdersToday;
     private markOrderPulledAtNow;
+    private clearOrderSnapshotMarker;
+    private getCurrentShopId;
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
@@ -335,7 +345,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
-     * await this.replaceOrdersSnapshotInSQLite(orderList)
+     * const { orders, persisted } = await this.replaceOrdersSnapshotInSQLite(orderList, 'refresh')
      */
     private replaceOrdersSnapshotInSQLite;
     /**