@pisell/pisellos 2.3.69 → 2.3.71

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

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

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

@@ -41,7 +41,6 @@ var import_payment_utils = require("../../../modules/Order/payment-utils");
 var INDEXDB_STORE_NAME = "orders";
 var ORDER_STORAGE_KEY_FIELD = "__order_storage_key";
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
-var ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY = "server_order_last_full_fetch_shop_id";
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
 var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2e3;
 var ORDER_SQLITE_DEDUPE_MS = 15e3;
@@ -193,21 +192,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
    */
   normalizeOrderCollectionsForIngress(order, source) {
-    const sourceOrderRecord = order;
-    let sourceOrder = sourceOrderRecord;
+    const sourceOrder = (0, import_lodash_es.cloneDeep)(order);
+    const sourceOrderRecord = sourceOrder;
     if (Array.isArray(sourceOrderRecord.payments)) {
-      sourceOrder = {
-        ...sourceOrderRecord,
-        payments: sourceOrderRecord.payments.map((payment) => {
-          if (!(0, import_payment_utils.isPendingOrderPayment)(payment) || (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => key.startsWith("unique_payment_number:"))) {
-            return payment;
-          }
-          return {
-            ...payment,
-            [PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER]: true
-          };
-        })
-      };
+      sourceOrderRecord.payments = sourceOrderRecord.payments.map((payment) => {
+        if (!(0, import_payment_utils.isPendingOrderPayment)(payment) || (0, import_payment_utils.getOrderPaymentIdentityKeys)(payment).some((key) => key.startsWith("unique_payment_number:"))) {
+          return payment;
+        }
+        return {
+          ...payment,
+          [PENDING_PAYMENT_WITHOUT_UNIQUE_MARKER]: true
+        };
+      });
     }
     const result = (0, import_orderCollectionIdentity.normalizeOrderCollections)(sourceOrder);
     const normalizedOrderRecord = result.order;
@@ -529,65 +525,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return DEFAULT_ORDER_SYNC_THROTTLE_MS;
   }
   async preload() {
-    const preloadStartedAt = Date.now();
-    let cachedOrders = null;
-    let sqliteLoadTimings;
-    if (this.dbManager) {
-      try {
-        cachedOrders = await this.loadOrdersFromSQLite({
-          throwOnError: true,
-          onTiming: (timings) => {
-            sqliteLoadTimings = timings;
-          }
-        });
-      } catch (error) {
-        this.logWarning("preload-SQLite读取失败，回退远端全量拉取", {
-          error: error instanceof Error ? error.message : String(error)
-        });
-      }
-    }
-    if (cachedOrders !== null && this.hasPulledOrdersToday()) {
-      const memoryPrepareStartedAt = performance.now();
-      const memoryOrders = this.prepareNormalizedOrdersForMemoryList(cachedOrders);
-      const memoryPrepareMs = +(performance.now() - memoryPrepareStartedAt).toFixed(2);
-      this.store.list = memoryOrders;
-      const syncMapStartedAt = performance.now();
-      this.syncOrdersMap();
-      const syncMapMs = +(performance.now() - syncMapStartedAt).toFixed(2);
-      const onOrdersLoadedStartedAt = performance.now();
-      await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, this.store.list);
-      const onOrdersLoadedMs = +(performance.now() - onOrdersLoadedStartedAt).toFixed(2);
-      const emitOrdersChangedStartedAt = performance.now();
-      await this.emitOrdersChanged([], "preload.sqlite");
-      const emitOrdersChangedMs = +(performance.now() - emitOrdersChangedStartedAt).toFixed(2);
-      this.logInfo("预加载完成", {
-        trigger: "preload",
-        source: "SQLite",
-        orderCount: this.store.list.length,
-        duration: `${Date.now() - preloadStartedAt}ms`,
-        stages: {
-          ...sqliteLoadTimings || {},
-          memoryPrepareMs,
-          syncMapMs,
-          onOrdersLoadedMs,
-          emitOrdersChangedMs
-        }
-      });
-      return;
-    }
-    const orders = await this.loadOrdersByServer({
-      trigger: "preload"
-    });
+    const orders = await this.loadOrdersByServer();
     this.store.list = (0, import_lodash_es.cloneDeep)(orders);
     this.syncOrdersMap();
     await this.emitOrdersChanged([], "preload");
     await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
-    this.logInfo("预加载完成", {
-      trigger: "preload",
-      source: "Server",
-      orderCount: this.store.list.length,
-      duration: `${Date.now() - preloadStartedAt}ms`
-    });
   }
   getOrders() {
     return this.store.list;
@@ -808,16 +750,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.logInfo("updateLocalPayment-变更事件完成", paymentContext);
     return { order: nextOrder, payment: nextPayment, previousPayment };
   }
-  async loadOrdersByServer(options = {}) {
+  async loadOrdersByServer() {
     var _a;
     let orderList = [];
-    let hasFetchedRemoteSnapshot = false;
-    const trigger = options.trigger || "unknown";
     const protectedOrdersBeforeRemoteFetch = (await this.loadOrdersFromSQLite()).filter(
       (order) => this.shouldProtectLocalOrderFromRemoteSnapshot(order)
     );
     this.logInfo("loadOrdersByServer-开始", {
-      trigger,
       hasOrderDataSource: !!this.orderDataSource,
       query: ((_a = this.store) == null ? void 0 : _a.createdAtQuery) || null,
       protectedLocalOrderCount: protectedOrdersBeforeRemoteFetch.length,
@@ -835,36 +774,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         });
         orderList = data || [];
         this.logInfo("loadOrdersByServer-SSE拉取成功", {
-          trigger,
           count: orderList.length
         });
-        hasFetchedRemoteSnapshot = true;
+        this.markOrderPulledAtNow();
         this.lastServerFullFetchAtMs = Date.now();
       } catch {
         this.logInfo("loadOrdersByServer-SSE拉取失败，保持当前内存订单");
         return this.store.list;
       }
     }
-    if (hasFetchedRemoteSnapshot) {
-      this.clearOrderSnapshotMarker();
-    }
-    const {
-      orders: mergedOrders,
-      persisted: isRemoteSnapshotPersisted
-    } = await this.replaceOrdersSnapshotInSQLite(
+    const mergedOrders = await this.replaceOrdersSnapshotInSQLite(
       orderList,
       "loadOrdersByServer",
       protectedOrdersBeforeRemoteFetch
     );
-    if (hasFetchedRemoteSnapshot && isRemoteSnapshotPersisted) {
-      this.markOrderPulledAtNow();
-    }
     const memoryOrders = this.normalizeOrdersForMemoryList(
       mergedOrders,
       "loadOrdersByServer.memory"
     );
     this.logInfo("loadOrdersByServer-结束", {
-      trigger,
       count: memoryOrders.length,
       persistedCount: mergedOrders.length,
       sqliteOnlyDraftCount: mergedOrders.length - memoryOrders.length
@@ -877,34 +805,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件
    * @returns 刷新后的订单列表
    */
-  async silentRefresh(options = {}) {
+  async silentRefresh() {
     const startTime = Date.now();
-    const trigger = options.trigger || "background";
     const elapsedSinceFullFetch = Date.now() - this.lastServerFullFetchAtMs;
     if (this.lastServerFullFetchAtMs > 0 && elapsedSinceFullFetch < ORDER_SILENT_REFRESH_MIN_INTERVAL_MS) {
-      this.logInfo("silentRefresh 跳过全量 SSE", {
-        trigger,
-        reason: "within_min_interval",
-        minIntervalMs: ORDER_SILENT_REFRESH_MIN_INTERVAL_MS,
-        elapsedSinceFullFetchMs: elapsedSinceFullFetch,
-        orderCount: this.store.list.length
-      });
       return this.store.list;
     }
-    this.logInfo("silentRefresh 开始", {
-      trigger,
-      elapsedSinceFullFetchMs: elapsedSinceFullFetch,
-      orderCount: this.store.list.length
-    });
+    this.logInfo("silentRefresh 开始");
     try {
       this.updateCreateStore();
-      const orders = await this.loadOrdersByServer({ trigger });
+      const orders = await this.loadOrdersByServer();
       this.store.list = (0, import_lodash_es.cloneDeep)(orders);
       this.syncOrdersMap();
       await this.emitOrdersChanged([], "silentRefresh");
       await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
       this.logInfo("silentRefresh 完成", {
-        trigger,
         orderCount: orders.length,
         duration: `${Date.now() - startTime}ms`
       });
@@ -912,7 +827,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       this.logError("silentRefresh 失败", {
-        trigger,
         duration: `${Date.now() - startTime}ms`,
         error: errorMessage
       });
@@ -921,12 +835,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   normalizeOrderForMemoryList(order, source = "normalizeOrderForMemoryList") {
     const normalizedOrder = this.normalizeOrderCollectionsForIngress(order, source);
-    return this.prepareNormalizedOrderForMemoryList(normalizedOrder);
-  }
-  /**
-   * 将已经完成集合规范化的订单转换为内存身份，不重复扫描 products/bookings/payments。
-   */
-  prepareNormalizedOrderForMemoryList(normalizedOrder) {
     const externalSaleNumber = normalizedOrder == null ? void 0 : normalizedOrder.external_sale_number;
     if (this.isDraftOrder(normalizedOrder) && !this.hasRealOrderId(normalizedOrder)) {
       return normalizedOrder;
@@ -942,9 +850,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       order_id: externalSaleNumber
     };
   }
-  prepareNormalizedOrdersForMemoryList(orders) {
-    return orders.map((order) => this.prepareNormalizedOrderForMemoryList(order)).filter((order) => this.shouldKeepOrderInMemory(order));
-  }
   normalizeOrdersForMemoryList(orders, source) {
     return orders.map((order) => this.normalizeOrderForMemoryList(order, source)).filter((order) => this.shouldKeepOrderInMemory(order));
   }
@@ -2232,29 +2137,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return { list, removedCount };
   }
   /**
-   * 当前订单缓存可复用窗口。
-   * start_time 模式使用精确的营业日起止时间；配置缺失或异常时退化为自然日。
+   * 当前订单拉取窗口：
+   * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
+   * - 无法解析时退化为自然日窗口
    */
-  getCurrentOrderCacheWindow() {
-    var _a;
+  getCurrentPullWindow() {
+    var _a, _b;
     const now = (0, import_dayjs.default)();
-    try {
-      const appPlugin = this.core.getPlugin("app");
-      const app = appPlugin == null ? void 0 : appPlugin.getApp();
-      const coreData = app == null ? void 0 : app.data.store.getStore().getDataByModel("core");
-      const boundary = (_a = coreData == null ? void 0 : coreData.core) == null ? void 0 : _a.operating_day_boundary;
-      if ((boundary == null ? void 0 : boundary.type) === "start_time") {
-        const boundaryTime = String(boundary.time || "").trim();
-        const todayBoundary = (0, import_dayjs.default)(`${now.format("YYYY-MM-DD")} ${boundaryTime}`);
-        if (todayBoundary.isValid()) {
-          const startAt2 = now.isBefore(todayBoundary) ? todayBoundary.subtract(1, "day") : todayBoundary;
-          return {
-            startAt: startAt2,
-            endExclusiveAt: startAt2.add(1, "day")
-          };
-        }
+    const range = (_b = (_a = this.store) == null ? void 0 : _a.createdAtQuery) == null ? void 0 : _b.sales_time_between;
+    if (Array.isArray(range) && range.length >= 2) {
+      const startAt2 = (0, import_dayjs.default)(range[0]);
+      const endExclusiveAt = (0, import_dayjs.default)(range[1]);
+      if (startAt2.isValid() && endExclusiveAt.isValid() && endExclusiveAt.isAfter(startAt2)) {
+        return { startAt: startAt2, endExclusiveAt };
       }
-    } catch {
     }
     const startAt = now.startOf("day");
     return { startAt, endExclusiveAt: startAt.add(1, "day") };
@@ -2263,51 +2159,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const lastFullFetchAt = this.getStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY);
     if (!lastFullFetchAt)
       return false;
-    const currentShopId = this.getCurrentShopId();
-    const lastFullFetchShopId = this.getStorageItem(
-      ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY
-    );
-    if (!currentShopId || !lastFullFetchShopId || currentShopId !== lastFullFetchShopId) {
-      return false;
-    }
     const parsed = (0, import_dayjs.default)(lastFullFetchAt);
     if (!parsed.isValid())
       return false;
-    const { startAt, endExclusiveAt } = this.getCurrentOrderCacheWindow();
+    const { startAt, endExclusiveAt } = this.getCurrentPullWindow();
     return (parsed.isAfter(startAt) || parsed.isSame(startAt)) && parsed.isBefore(endExclusiveAt);
   }
   markOrderPulledAtNow() {
-    const currentShopId = this.getCurrentShopId();
-    if (!currentShopId)
-      return;
     this.setStorageItem(
       ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY,
       (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
     );
-    this.setStorageItem(
-      ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY,
-      currentShopId
-    );
-  }
-  clearOrderSnapshotMarker() {
-    this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, "");
-    this.setStorageItem(ORDER_LAST_FULL_FETCH_SHOP_ID_STORAGE_KEY, "");
-  }
-  getCurrentShopId() {
-    var _a;
-    try {
-      const appPlugin = this.core.getPlugin("app");
-      const app = appPlugin == null ? void 0 : appPlugin.getApp();
-      if (!app)
-        return null;
-      const coreData = app.data.store.getStore().getDataByModel("core");
-      const shopId = (_a = coreData == null ? void 0 : coreData.core) == null ? void 0 : _a.id;
-      if (shopId === void 0 || shopId === null || shopId === "")
-        return null;
-      return String(shopId);
-    } catch {
-      return null;
-    }
   }
   getStorageItem(key) {
     var _a;
@@ -2334,29 +2196,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } catch {
     }
   }
-  async loadOrdersFromSQLite(options = {}) {
-    var _a;
+  async loadOrdersFromSQLite() {
     if (!this.dbManager)
       return [];
     try {
-      const loadStartedAt = performance.now();
-      const rawReadStartedAt = performance.now();
       const orders = await this.dbManager.getAll(INDEXDB_STORE_NAME);
-      const sqliteRawReadMs = +(performance.now() - rawReadStartedAt).toFixed(2);
-      const normalizeStartedAt = performance.now();
-      const normalizedOrders = (orders || []).map(
+      return (orders || []).map(
         (order) => this.normalizeOrderCollectionsForIngress(order, "loadOrdersFromSQLite")
       );
-      const sqliteNormalizeMs = +(performance.now() - normalizeStartedAt).toFixed(2);
-      (_a = options.onTiming) == null ? void 0 : _a.call(options, {
-        sqliteRawReadMs,
-        sqliteNormalizeMs,
-        sqliteLoadTotalMs: +(performance.now() - loadStartedAt).toFixed(2)
-      });
-      return normalizedOrders;
-    } catch (error) {
-      if (options.throwOnError)
-        throw error;
+    } catch {
       return [];
     }
   }
@@ -2624,17 +2472,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 用于 SSE 全量拉取与营业日窗口裁剪。
    *
    * @example
-   * const { orders, persisted } = await this.replaceOrdersSnapshotInSQLite(orderList, 'refresh')
+   * await this.replaceOrdersSnapshotInSQLite(orderList)
    */
   async replaceOrdersSnapshotInSQLite(orderList, source, protectedOrdersBeforeRemoteFetch = []) {
     if (!this.dbManager) {
-      return {
-        orders: this.compactOrderListByIdentity(
-          orderList.map((order) => this.normalizeRemoteSyncedOrder(order)),
-          `${source}.snapshotNoDb`
-        ).list,
-        persisted: false
-      };
+      return this.compactOrderListByIdentity(
+        orderList.map((order) => this.normalizeRemoteSyncedOrder(order)),
+        `${source}.snapshotNoDb`
+      ).list;
     }
     const remoteSnapshot = (0, import_lodash_es.cloneDeep)(orderList).map(
       (order) => this.normalizeOrderCollectionsForIngress(order, `${source}.remoteIngress`)
@@ -2643,7 +2488,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       remoteSnapshot.map((order) => this.normalizeRemoteSyncedOrder(order)),
       `${source}.remoteSnapshot`
     ).list;
-    let persisted = false;
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         const existingOrders = typeof this.dbManager.getAll === "function" ? await this.dbManager.getAll(INDEXDB_STORE_NAME) : [];
@@ -2708,14 +2552,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           count: mergedSnapshot.length
         });
       });
-      persisted = true;
     } catch (error) {
       this.logError("全量保存订单到 SQLite 失败", {
         error: error instanceof Error ? error.message : String(error),
         orderList: remoteSnapshot.length
       });
     }
-    return { orders: mergedSnapshot, persisted };
+    return mergedSnapshot;
   }
   /**
    * 清空订单模块的内存数据和本地 SQLite 订单表。
@@ -2731,7 +2574,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         await this.dbManager.clear(INDEXDB_STORE_NAME);
       });
     }
-    this.clearOrderSnapshotMarker();
+    this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, "");
     this.emitOrdersChanged([], "clear");
   }
 };

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

@@ -25,7 +25,6 @@ export declare class ProductsModule extends BaseModule implements Module {
     private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
-    private quotationBridgeUpdatedCallback?;
     private quotationScheduleCache;
     private quotationScheduleCacheSource;
     private quotationScheduleCacheLoaded;
@@ -73,7 +72,6 @@ export declare class ProductsModule extends BaseModule implements Module {
         scheduleModule?: any;
         channel?: string;
         customer_id?: number | string;
-        onQuotationUpdated?: () => void;
     }): Promise<void>;
     /**
      * 刷新桥接器内的报价单列表。
@@ -183,9 +181,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     /**
      * 通过 ProductDataSource SSE 加载完整商品列表
      */
-    loadProductsByServer(options?: {
-        trigger?: string;
-    }): Promise<any>;
+    loadProductsByServer(): Promise<any>;
     /**
      * 纯请求方法：通过 HTTP 接口获取商品列表（无副作用，不触发事件、不写 IndexDB）
      * @param params 查询参数
@@ -335,9 +331,7 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted
      * @returns 刷新后的商品列表
      */
-    silentRefresh(options?: {
-        trigger?: string;
-    }): Promise<ProductData[]>;
+    silentRefresh(): Promise<ProductData[]>;
     /**
      * 销毁同步资源（取消 pubsub 订阅、清除定时器）
      */