@pisell/pisellos 2.3.58 → 2.3.59

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

@@ -263,6 +263,11 @@ declare class Server {
      * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
      */
     private recomputeAndNotifySubscriber;
+    /**
+     * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+     * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+     */
+    private getMenuScheduleTimePoints;
     /**
      * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
      */
@@ -518,6 +523,10 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+     */
+    private shouldAutoPrintCheckoutReceipt;
     private shouldBuildSmallTicketData;
     private shouldPrintSyncedOrder;
     private hasPaymentStatus;

package/lib/server/index.js

@@ -45,6 +45,7 @@ var import_floor_plan = require("./modules/floor-plan");
 var import_types = require("./modules/floor-plan/types");
 var import_payment = require("./modules/payment");
 var import_schedule2 = require("./utils/schedule");
+var import_time = require("./utils/time");
 var import_types2 = require("./modules/products/types");
 var import_product = require("./utils/product");
 var import_order = require("./modules/order");
@@ -65,6 +66,7 @@ var PRODUCT_TITLE_SNAPSHOT_KEYS = [
   "kitchen",
   "original"
 ];
+var AUTO_PRINT_STORAGE_KEY = "auto_print";
 var Server = class {
   constructor(core) {
     this.quotationAvailableCache = /* @__PURE__ */ new Map();
@@ -254,7 +256,11 @@ var Server = class {
         strategy_context
       });
       if (subscriberId && typeof callback === "function") {
-        this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
+        this.syncProductQueryScheduleTimers({
+          subscriberId,
+          menu_list_ids,
+          strategy_context
+        });
       }
       return result;
     };
@@ -1081,7 +1087,12 @@ var Server = class {
         };
       }
       try {
-        const menuList = this.menu.getMenuByIds(menu_list_ids);
+        const {
+          menuList,
+          scheduleIds,
+          scheduleList,
+          timePoints
+        } = this.getMenuScheduleTimePoints(menu_list_ids);
         console.log(`[Server] 找到 ${menuList.length} 个餐牌`);
         this.logInfo("handleGetScheduleTimePoints: 获取到餐牌列表", {
           requestedCount: menu_list_ids.length,
@@ -1089,7 +1100,6 @@ var Server = class {
           menu_list_ids,
           menuList
         });
-        const scheduleIds = (0, import_schedule2.extractScheduleIdsFromMenus)(menuList);
         console.log(`[Server] 提取到 ${scheduleIds.length} 个日程ID:`, scheduleIds);
         this.logInfo("handleGetScheduleTimePoints: 提取到日程 IDs", {
           scheduleCount: scheduleIds.length
@@ -1103,13 +1113,11 @@ var Server = class {
             status: true
           };
         }
-        const scheduleList = this.schedule.getScheduleByIds(scheduleIds);
         console.log(`[Server] 找到 ${scheduleList.length} 个日程`);
         this.logInfo("handleGetScheduleTimePoints: 获取到日程详情", {
           requestedCount: scheduleIds.length,
           foundCount: scheduleList.length
         });
-        const timePoints = (0, import_schedule2.extractTimePointsFromSchedules)(scheduleList);
         console.log(`[Server] 提取到 ${timePoints.length} 个时间点:`, timePoints);
         this.logInfo("handleGetScheduleTimePoints 处理完成", {
           menuListIdsCount: menu_list_ids.length,
@@ -1680,11 +1688,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) {
@@ -2319,16 +2338,44 @@ var Server = class {
       });
     }
   }
+  /**
+   * 根据餐牌 ID 获取其绑定日程中的全部时间点。
+   * 商品查询定时器与 schedule-time-points 路由共用此逻辑。
+   */
+  getMenuScheduleTimePoints(menuListIds) {
+    var _a, _b;
+    const menuList = ((_a = this.menu) == null ? void 0 : _a.getMenuByIds(menuListIds)) ?? [];
+    const scheduleIds = (0, import_schedule2.extractScheduleIdsFromMenus)(menuList);
+    const scheduleList = scheduleIds.length > 0 ? ((_b = this.schedule) == null ? void 0 : _b.getScheduleByIds(scheduleIds)) ?? [] : [];
+    const timePoints = (0, import_schedule2.extractTimePointsFromSchedules)(scheduleList);
+    return {
+      menuList,
+      scheduleIds,
+      scheduleList,
+      timePoints
+    };
+  }
   /**
    * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
    */
-  syncProductQueryScheduleTimers(subscriberId, strategy_context) {
+  syncProductQueryScheduleTimers({
+    subscriberId,
+    menu_list_ids,
+    strategy_context
+  }) {
     var _a, _b;
     this.clearSubscriberScheduleTimers(subscriberId);
     if (!this.shouldScheduleProductQueryReload(strategy_context)) {
       return;
     }
-    const timePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
+    const productTimePoints = ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? [];
+    const menuListIds = Array.isArray(menu_list_ids) ? Array.from(new Set(
+      menu_list_ids.map((id) => Number(id)).filter((id) => Number.isFinite(id))
+    )) : [];
+    const menuTimePoints = this.getMenuScheduleTimePoints(menuListIds).timePoints;
+    const timePoints = (0, import_time.sortTimePoints)(
+      Array.from(/* @__PURE__ */ new Set([...productTimePoints, ...menuTimePoints]))
+    );
     if (timePoints.length > 0) {
       this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
     }
@@ -3791,7 +3838,6 @@ var Server = class {
     });
   }
   async handleOrderCheckoutSubmit(params) {
-    var _a;
     const { backendPath, data, title } = params;
     this.logInfo(`${title}: 开始处理`, {
       backendPath,
@@ -3816,15 +3862,14 @@ var Server = class {
     });
     if ((pendingResult == null ? void 0 : pendingResult.status) === true) {
       const pendingOrder = pendingResult.data;
-      const platform = (_a = this.core.context) == null ? void 0 : _a.getPlatform();
-      const isAndroid = platform === "android";
-      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && // TODO 这里先加个兼容，如果是安卓，则需要 type=virtual 才走打印，如果是苹果则无限制
-      (isAndroid ? checkoutData.type === "virtual" : true)) {
+      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
         await this.dispatchLocalReceiptPrint({
           checkoutData,
           order: pendingOrder,
           response: pendingResult,
-          requireFullyPaid: true
+          requireFullyPaid: true,
+          // 自动小票固定使用 print_all 的收据类型 0，不随订单 type 改成券/手环类型 99。
+          isManualPrint: true
         });
       }
       await this.dispatchCheckoutSyncTask({
@@ -4054,6 +4099,15 @@ var Server = class {
       { requireFullyPaid: true, productMap }
     );
   }
+  /**
+   * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+   */
+  shouldAutoPrintCheckoutReceipt() {
+    var _a, _b, _c, _d, _e;
+    if (((_b = (_a = this.core.context) == null ? void 0 : _a.getPlatform) == null ? void 0 : _b.call(_a)) !== "android")
+      return true;
+    return ((_e = (_d = (_c = this.app) == null ? void 0 : _c.storage) == null ? void 0 : _d.getStorage) == null ? void 0 : _e.call(_d, AUTO_PRINT_STORAGE_KEY)) === "true";
+  }
   shouldBuildSmallTicketData(order) {
     if (!order || typeof order !== "object")
       return false;

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/order/index.d.ts

@@ -290,13 +290,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;
@@ -334,7 +335,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;
     /**