@pisell/pisellos 2.3.57 → 2.3.59

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

@@ -40,6 +40,7 @@ var import_types = require("./types");
 var import_payment_utils = require("../../../modules/Order/payment-utils");
 var INDEXDB_STORE_NAME = "orders";
 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;
@@ -524,6 +525,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return DEFAULT_ORDER_SYNC_THROTTLE_MS;
   }
   async preload() {
+    let cachedOrders = null;
+    if (this.dbManager) {
+      try {
+        cachedOrders = await this.loadOrdersFromSQLite({ throwOnError: true });
+      } catch (error) {
+        this.logWarning("preload-SQLite读取失败，回退远端全量拉取", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+    }
+    if (cachedOrders !== null && this.hasPulledOrdersToday()) {
+      const memoryOrders = this.normalizeOrdersForMemoryList(
+        cachedOrders,
+        "preload.sqliteMemory"
+      );
+      this.store.list = (0, import_lodash_es.cloneDeep)(memoryOrders);
+      this.syncOrdersMap();
+      await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, this.store.list);
+      await this.emitOrdersChanged([], "preload.sqlite");
+      return;
+    }
     const orders = await this.loadOrdersByServer();
     this.store.list = (0, import_lodash_es.cloneDeep)(orders);
     this.syncOrdersMap();
@@ -752,6 +774,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async loadOrdersByServer() {
     var _a;
     let orderList = [];
+    let hasFetchedRemoteSnapshot = false;
     const protectedOrdersBeforeRemoteFetch = (await this.loadOrdersFromSQLite()).filter(
       (order) => this.shouldProtectLocalOrderFromRemoteSnapshot(order)
     );
@@ -775,18 +798,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         this.logInfo("loadOrdersByServer-SSE拉取成功", {
           count: orderList.length
         });
-        this.markOrderPulledAtNow();
+        hasFetchedRemoteSnapshot = true;
         this.lastServerFullFetchAtMs = Date.now();
       } catch {
         this.logInfo("loadOrdersByServer-SSE拉取失败，保持当前内存订单");
         return this.store.list;
       }
     }
-    const mergedOrders = await this.replaceOrdersSnapshotInSQLite(
+    if (hasFetchedRemoteSnapshot) {
+      this.clearOrderSnapshotMarker();
+    }
+    const {
+      orders: mergedOrders,
+      persisted: isRemoteSnapshotPersisted
+    } = await this.replaceOrdersSnapshotInSQLite(
       orderList,
       "loadOrdersByServer",
       protectedOrdersBeforeRemoteFetch
     );
+    if (hasFetchedRemoteSnapshot && isRemoteSnapshotPersisted) {
+      this.markOrderPulledAtNow();
+    }
     const memoryOrders = this.normalizeOrdersForMemoryList(
       mergedOrders,
       "loadOrdersByServer.memory"
@@ -920,10 +952,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async upsertOrdersFromRemote(freshOrders, source = "upsertOrdersFromRemote") {
     if (!(freshOrders == null ? void 0 : freshOrders.length)) {
-      this.logInfo("upsertOrdersFromRemote-订单列表为空", {});
+      this.logInfo("upsertOrdersFromRemote-订单列表为空", { source });
       return;
     }
-    this.logInfo("upsertOrdersFromRemote-开始", { count: freshOrders.length, source });
+    this.logInfo("upsertOrdersFromRemote-开始", {
+      count: freshOrders.length,
+      source
+    });
     await this.mergeOrdersToStore(freshOrders, source);
   }
   async markOrderSyncedByExternalSaleNumber(params) {
@@ -1685,6 +1720,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   isRemoteEchoMergeSource(source) {
     return source === "pubsub.bodyUpsert" || source === "pubsub.httpRefresh";
   }
+  isRemoteProductMembershipChangeSource(source) {
+    return this.isRemoteEchoMergeSource(source) || source === "manual.editOpenRemoteCheck";
+  }
   getProductMembershipKey(product) {
     const persistentId = (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)("product", product);
     if (persistentId)
@@ -1717,7 +1755,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
    */
   getRemoteProductMembershipChange(existingOrder, mergedOrder, source) {
-    if (!this.isRemoteEchoMergeSource(source))
+    if (!this.isRemoteProductMembershipChangeSource(source))
       return null;
     const previousProducts = Array.isArray(existingOrder.products) ? existingOrder.products : [];
     const currentProducts = Array.isArray(mergedOrder.products) ? mergedOrder.products : [];
@@ -2113,20 +2151,29 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return { list, removedCount };
   }
   /**
-   * 当前订单拉取窗口：
-   * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）
-   * - 无法解析时退化为自然日窗口
+   * 当前订单缓存可复用窗口。
+   * start_time 模式使用精确的营业日起止时间；配置缺失或异常时退化为自然日。
    */
-  getCurrentPullWindow() {
-    var _a, _b;
+  getCurrentOrderCacheWindow() {
+    var _a;
     const now = (0, import_dayjs.default)();
-    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 };
+    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")
+          };
+        }
       }
+    } catch {
     }
     const startAt = now.startOf("day");
     return { startAt, endExclusiveAt: startAt.add(1, "day") };
@@ -2135,17 +2182,51 @@ 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.getCurrentPullWindow();
+    const { startAt, endExclusiveAt } = this.getCurrentOrderCacheWindow();
     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;
@@ -2172,7 +2253,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     } catch {
     }
   }
-  async loadOrdersFromSQLite() {
+  async loadOrdersFromSQLite(options = {}) {
     if (!this.dbManager)
       return [];
     try {
@@ -2180,7 +2261,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return (orders || []).map(
         (order) => this.normalizeOrderCollectionsForIngress(order, "loadOrdersFromSQLite")
       );
-    } catch {
+    } catch (error) {
+      if (options.throwOnError)
+        throw error;
       return [];
     }
   }
@@ -2402,14 +2485,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 用于 SSE 全量拉取与营业日窗口裁剪。
    *
    * @example
-   * await this.replaceOrdersSnapshotInSQLite(orderList)
+   * const { orders, persisted } = await this.replaceOrdersSnapshotInSQLite(orderList, 'refresh')
    */
   async replaceOrdersSnapshotInSQLite(orderList, source, protectedOrdersBeforeRemoteFetch = []) {
     if (!this.dbManager) {
-      return this.compactOrderListByIdentity(
-        orderList.map((order) => this.normalizeRemoteSyncedOrder(order)),
-        `${source}.snapshotNoDb`
-      ).list;
+      return {
+        orders: this.compactOrderListByIdentity(
+          orderList.map((order) => this.normalizeRemoteSyncedOrder(order)),
+          `${source}.snapshotNoDb`
+        ).list,
+        persisted: false
+      };
     }
     const remoteSnapshot = (0, import_lodash_es.cloneDeep)(orderList).map(
       (order) => this.normalizeOrderCollectionsForIngress(order, `${source}.remoteIngress`)
@@ -2418,6 +2504,7 @@ 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) : [];
@@ -2482,13 +2569,14 @@ 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 mergedSnapshot;
+    return { orders: mergedSnapshot, persisted };
   }
   /**
    * 清空订单模块的内存数据和本地 SQLite 订单表。
@@ -2504,7 +2592,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         await this.dbManager.clear(INDEXDB_STORE_NAME);
       });
     }
-    this.setStorageItem(ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY, "");
+    this.clearOrderSnapshotMarker();
     this.emitOrdersChanged([], "clear");
   }
 };

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

@@ -568,7 +568,7 @@ export interface OrderChangedPayload {
     /** 触发来源，便于订阅者区分 pubsub / 远端覆盖 / 清空等场景 */
     source?: string;
 }
-export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh';
+export type RemoteProductMembershipChangeSource = 'pubsub.bodyUpsert' | 'pubsub.httpRefresh' | 'manual.editOpenRemoteCheck';
 /**
  * 远端订单快照相对本地订单产生商品成员增删时的广播载荷。
  * 只表达商品行成员关系变化，不包含数量、价格、备注等字段级修改。

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

@@ -25,6 +25,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
+    private quotationBridgeUpdatedCallback?;
     private quotationScheduleCache;
     private quotationScheduleCacheSource;
     private quotationScheduleCacheLoaded;
@@ -72,6 +73,7 @@ export declare class ProductsModule extends BaseModule implements Module {
         scheduleModule?: any;
         channel?: string;
         customer_id?: number | string;
+        onQuotationUpdated?: () => void;
     }): Promise<void>;
     /**
      * 刷新桥接器内的报价单列表。

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

@@ -192,7 +192,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层负责传入完整 schedule 模块，Products 只负责把报价单计算结果转成价格响应形状。
    */
   async setupQuotationPriceBridge(params) {
-    var _a;
+    var _a, _b, _c;
     if (!this.core) {
       this.logWarning("setupQuotationPriceBridge: core 尚未初始化");
       return;
@@ -211,13 +211,13 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         this.quotationScheduleCacheSource = params.scheduleModule;
       }
       this.quotationPriceBridge.setScheduleResolver((id) => {
-        var _a2, _b, _c, _d, _e, _f;
+        var _a2, _b2, _c2, _d, _e, _f;
         const scheduleId = String(id);
         if (this.quotationScheduleCache.has(scheduleId)) {
           return this.quotationScheduleCache.get(scheduleId);
         }
         if (!this.quotationScheduleCacheLoaded) {
-          const scheduleList = ((_b = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b.call(_a2)) || [];
+          const scheduleList = ((_b2 = (_a2 = params.scheduleModule).getScheduleList) == null ? void 0 : _b2.call(_a2)) || [];
           for (const schedule of scheduleList) {
             this.quotationScheduleCache.set(String(schedule.id), schedule);
           }
@@ -226,12 +226,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         if (this.quotationScheduleCache.has(scheduleId)) {
           return this.quotationScheduleCache.get(scheduleId);
         }
-        const schedules = ((_d = (_c = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
+        const schedules = ((_d = (_c2 = params.scheduleModule).getScheduleListByIds) == null ? void 0 : _d.call(_c2, [id])) || ((_f = (_e = params.scheduleModule).getScheduleByIds) == null ? void 0 : _f.call(_e, [id])) || [];
         if (schedules[0])
           this.quotationScheduleCache.set(scheduleId, schedules[0]);
         return schedules[0];
       });
     }
+    if (params.onQuotationUpdated) {
+      this.quotationBridgeUpdatedCallback = params.onQuotationUpdated;
+    }
+    (_c = (_b = this.quotationPriceBridge).setQuotationListUpdatedListener) == null ? void 0 : _c.call(_b, () => {
+      var _a2;
+      this.quotationBridgeLoadedKey = this.getQuotationBridgeScopeKey();
+      this.clearPriceCache();
+      (_a2 = this.quotationBridgeUpdatedCallback) == null ? void 0 : _a2.call(this);
+    });
     await this.refreshQuotationPriceBridge({ customer_id: params.customer_id });
   }
   /**
@@ -798,6 +807,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   clearPriceCache() {
     this.productsPriceCache.clear();
+    this.quotationScheduleCache.clear();
+    this.quotationScheduleCacheLoaded = false;
     console.log("[ProductsModule] 🗑️ 商品价格缓存已清空");
   }
   /**

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

@@ -88,13 +88,18 @@ var ResourceModule = class extends import_BaseModule.BaseModule {
     }
   }
   async preload() {
-    await this.setupResourceSync();
     const cachedResources = await this.loadResourcesFromSQLite();
     if (cachedResources.length > 0) {
       this.store.list = (0, import_lodash_es.cloneDeep)(cachedResources).map((item) => this.normalizeResource(item));
       this.syncResourcesMap();
       await this.safeEmit(import_types.ResourceHooks.onResourcesChanged, this.store.list);
-    } else {
+      void this.setupResourceSync().catch((error) => {
+        this.logError("后台初始化资源同步失败", error);
+      });
+      return;
+    }
+    await this.setupResourceSync();
+    if (this.store.list.length === 0) {
       const resources = await this.loadResourcesByServer();
       if (resources.length > 0) {
         this.store.list = (0, import_lodash_es.cloneDeep)(resources).map((item) => this.normalizeResource(item));

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.57",
+  "version": "2.3.59",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",