@pisell/pisellos 2.2.278 → 2.2.280

package/lib/modules/Schedule/index.js

@@ -95,12 +95,12 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
    *
    * @memberof ScheduleModule
    */
-  async loadAllSchedule() {
+  async loadAllSchedule(options = {}) {
     var _a;
     const scheduleList = await this.request.get(
       `/schedule`,
       { num: 999 },
-      { useCache: true }
+      { useCache: options.useCache ?? true }
     );
     this.setScheduleList(((_a = scheduleList.data) == null ? void 0 : _a.list) || []);
   }
@@ -126,7 +126,6 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
     custom_page_id,
     channel
   }) {
-    var _a, _b, _c;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day")) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
@@ -144,17 +143,20 @@ var ScheduleModule = class extends import_BaseModule.BaseModule {
         channel
       }
     );
-    this.setAvailabilityScheduleDateList(res.data.date_list);
-    this.setOtherProductsIds(res.data.other_product_ids || []);
-    if (!((_a = res.data.date_list) == null ? void 0 : _a.length) && !((_b = res.data.other_product_ids) == null ? void 0 : _b.length) || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
+    const responseData = res.data || {};
+    const dateList = Array.isArray(responseData.date_list) ? responseData.date_list : [];
+    const otherProductIds = Array.isArray(responseData.other_product_ids) ? responseData.other_product_ids : [];
+    this.setAvailabilityScheduleDateList(dateList);
+    this.setOtherProductsIds(otherProductIds);
+    if (!dateList.length && !otherProductIds.length || (0, import_dayjs.default)(endDate).isBefore((0, import_dayjs.default)(), "day")) {
       return dates;
     }
-    if ((_c = res.data.other_product_ids) == null ? void 0 : _c.length) {
+    if (otherProductIds.length) {
       dates.forEach((n) => {
         n.status = "available";
       });
     } else {
-      res.data.date_list.forEach((n) => {
+      dateList.forEach((n) => {
         const index = dates.findIndex((m) => m.date === n.date);
         if (index !== -1) {
           dates[index].status = "available";

package/lib/modules/Summary/utils.js

@@ -437,11 +437,31 @@ var getBundleItemIsDiscountPrice = (item) => {
 var getBundleItemIsMarkupOrDiscountPrice = (item) => {
   return getBundleItemIsMarkupPrice(item) || getBundleItemIsDiscountPrice(item);
 };
+var getDiscountAmount = (discounts) => {
+  return (discounts || []).reduce((total, discount) => {
+    return total.add(new import_decimal.default(discount.amount || 0));
+  }, new import_decimal.default(0)).toNumber();
+};
 var getMainProductTotal = (item) => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   let total = new import_decimal.default(
     (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
   );
+  const hasMainProductPrice = (item == null ? void 0 : item.main_product_selling_price) != null || ((_c = item == null ? void 0 : item.metadata) == null ? void 0 : _c.main_product_selling_price) != null || ((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.main_product_original_price) != null;
+  if (!hasMainProductPrice) {
+    total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.main_product_selling_price) ?? item.price ?? 0);
+    const discount = ((_g = (_f = item == null ? void 0 : item._origin) == null ? void 0 : _f.product) == null ? void 0 : _g.discount_list) || ((_j = (_i = (_h = item == null ? void 0 : item._originData) == null ? void 0 : _h.product) == null ? void 0 : _i.discount_list) == null ? void 0 : _j.filter((item2) => {
+      var _a2;
+      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+    })) || [];
+    const mainProductDiscountAmount = getDiscountAmount(discount);
+    total = total.minus(mainProductDiscountAmount);
+    if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
+      total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
+        return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
+      }, new import_decimal.default(0)));
+    }
+  }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);

package/lib/modules/index.d.ts

@@ -18,3 +18,5 @@ export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
 export * from './BookingContext';
+export * from './Holder';
+export * from './ResourcePlanner';

package/lib/modules/index.js

@@ -36,6 +36,8 @@ __reExport(modules_exports, require("./Quotation"), module.exports);
 __reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
 __reExport(modules_exports, require("./OpenData"), module.exports);
 __reExport(modules_exports, require("./BookingContext"), module.exports);
+__reExport(modules_exports, require("./Holder"), module.exports);
+__reExport(modules_exports, require("./ResourcePlanner"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -57,5 +59,7 @@ __reExport(modules_exports, require("./BookingContext"), module.exports);
   ...require("./Quotation"),
   ...require("./ScanOrderLogger"),
   ...require("./OpenData"),
-  ...require("./BookingContext")
+  ...require("./BookingContext"),
+  ...require("./Holder"),
+  ...require("./ResourcePlanner")
 });

package/lib/plugins/window.d.ts

@@ -16,6 +16,7 @@ export interface WindowPlugin extends Plugin {
     history: History;
     interaction?: any;
     getWalletPassEvaluator?: () => WalletPassEvaluator;
+    getLocalStorage?: (key: string) => string | null;
 }
 /**
  * 简单的 Storage 接口实现

package/lib/server/index.d.ts

@@ -49,6 +49,10 @@ declare class Server {
     private productQuerySubscribers;
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     private productQueryScheduleTimers;
+    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
+    private menuScheduleRefreshInFlight;
+    private lastMenuScheduleRefreshAt;
+    private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -160,6 +164,12 @@ declare class Server {
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
     refreshOrdersInBackground(): Promise<void>;
+    /**
+     * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+     * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+     * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+     */
+    checkRemoteOrderProductMembership(orderId: string | number): Promise<void>;
     /**
      * 清空所有server模块的IndexedDB缓存
      * @returns Promise<void>
@@ -267,6 +277,16 @@ declare class Server {
      * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
+    /**
+     * ProductList callers such as standalone retail pages do not always have a selected schedule.
+     * In that case query against the current local time so menu availability can still be evaluated.
+     */
+    private resolveProductQueryScheduleContext;
+    /**
+     * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
+     * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
+     */
+    private refreshMenuScheduleCacheAfterEmptyResult;
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
      * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。

package/lib/server/index.js

@@ -84,6 +84,10 @@ var Server = class {
     this.productQuerySubscribers = /* @__PURE__ */ new Map();
     /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
     this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
+    /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
+    this.menuScheduleRefreshInFlight = null;
+    this.lastMenuScheduleRefreshAt = 0;
+    this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS = 30 * 1e3;
     // ---- 订单 / 预约列表查询订阅者 ----
     this.orderQuerySubscribers = /* @__PURE__ */ new Map();
     this.bookingQuerySubscribers = /* @__PURE__ */ new Map();
@@ -217,7 +221,11 @@ var Server = class {
      */
     this.handleProductQuery = async ({ url, method, data, config }) => {
       console.log("[Server] handleProductQuery:", url, method, data, config);
-      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type, strategy_context } = data;
+      const { menu_list_ids, customer_id, ids, extension_type, strategy_context } = data;
+      const { schedule_date, schedule_datetime } = this.resolveProductQueryScheduleContext({
+        schedule_date: data.schedule_date,
+        schedule_datetime: data.schedule_datetime
+      });
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -1789,6 +1797,57 @@ var Server = class {
       });
     }
   }
+  /**
+   * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
+   * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
+   * UI 可复用 order:onRemoteProductMembershipChanged 处理冲突。
+   */
+  async checkRemoteOrderProductMembership(orderId) {
+    const normalizedOrderId = String(orderId ?? "").trim();
+    if (!normalizedOrderId || normalizedOrderId.startsWith("local_order")) {
+      this.logInfo("checkRemoteOrderProductMembership: 跳过非正式订单", {
+        orderId
+      });
+      return;
+    }
+    if (!this.order) {
+      const error = new Error("Order 模块未注册");
+      this.logWarning("checkRemoteOrderProductMembership: Order 模块未注册", {
+        orderId: normalizedOrderId
+      });
+      throw error;
+    }
+    this.logInfo("checkRemoteOrderProductMembership 开始", {
+      orderId: normalizedOrderId
+    });
+    const startTime = Date.now();
+    try {
+      const freshOrders = await this.order.fetchOrdersByHttp([
+        normalizedOrderId
+      ]);
+      const freshOrder = freshOrders.find(
+        (order) => String(order == null ? void 0 : order.order_id) === normalizedOrderId
+      );
+      if (!freshOrder) {
+        throw new Error("Server 未返回目标订单最新快照");
+      }
+      await this.order.upsertOrdersFromRemote(
+        [freshOrder],
+        "manual.editOpenRemoteCheck"
+      );
+      this.logInfo("checkRemoteOrderProductMembership 完成", {
+        orderId: normalizedOrderId,
+        duration: `${Date.now() - startTime}ms`
+      });
+    } catch (error) {
+      this.logError("checkRemoteOrderProductMembership 失败", {
+        orderId: normalizedOrderId,
+        duration: `${Date.now() - startTime}ms`,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    }
+  }
   /**
    * 清空所有server模块的IndexedDB缓存
    * @returns Promise<void>
@@ -2219,15 +2278,12 @@ var Server = class {
       return;
     const scheduleDate = subscriber.context.schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD");
     const timerIds = [];
-    for (const timePoint of timePoints) {
-      const delayMs = this.computeScheduleTimePointDelayMs(scheduleDate, timePoint);
-      if (delayMs < 0)
-        continue;
-      const timerId = setTimeout(() => {
-        void this.onScheduleTimePointTimerFire(subscriberId, timerId);
-      }, delayMs);
-      timerIds.push(timerId);
-    }
+    setInterval(() => {
+      const currentTime = (0, import_dayjs.default)().format("hh:mm");
+      if (timePoints.includes(currentTime)) {
+        this.onScheduleTimePointTimerFire(subscriberId);
+      }
+    }, 6e4);
     if (timerIds.length > 0) {
       this.productQueryScheduleTimers.set(subscriberId, timerIds);
       subscriber.scheduleTimerIds = timerIds;
@@ -2242,7 +2298,7 @@ var Server = class {
    * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
    */
   async onScheduleTimePointTimerFire(subscriberId, timerId) {
-    this.removeScheduleTimerRef(subscriberId, timerId);
+    timerId && this.removeScheduleTimerRef(subscriberId, timerId);
     if (!this.productQuerySubscribers.has(subscriberId))
       return;
     const subscriber = this.productQuerySubscribers.get(subscriberId);
@@ -2313,6 +2369,43 @@ var Server = class {
       this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
     }
   }
+  /**
+   * ProductList callers such as standalone retail pages do not always have a selected schedule.
+   * In that case query against the current local time so menu availability can still be evaluated.
+   */
+  resolveProductQueryScheduleContext(params) {
+    const now = (0, import_dayjs.default)();
+    const schedule_datetime = typeof params.schedule_datetime === "string" && params.schedule_datetime.trim() ? params.schedule_datetime : now.format("YYYY-MM-DD HH:mm:ss");
+    const schedule_date = typeof params.schedule_date === "string" && params.schedule_date.trim() ? params.schedule_date : (0, import_dayjs.default)(schedule_datetime).isValid() ? (0, import_dayjs.default)(schedule_datetime).format("YYYY-MM-DD") : now.format("YYYY-MM-DD");
+    return { schedule_date, schedule_datetime };
+  }
+  /**
+   * OpenData 的关联餐牌可能已更新，而 server_menu/server_schedule 仍命中本地持久化缓存。
+   * 仅在当前筛选没有任何生效餐牌时刷新一次，并由调用方重新计算筛选结果。
+   */
+  async refreshMenuScheduleCacheAfterEmptyResult() {
+    if (!this.menu || !this.schedule)
+      return false;
+    const now = Date.now();
+    if (now - this.lastMenuScheduleRefreshAt < this.MENU_SCHEDULE_REFRESH_COOLDOWN_MS) {
+      return false;
+    }
+    if (!this.menuScheduleRefreshInFlight) {
+      this.lastMenuScheduleRefreshAt = now;
+      this.menuScheduleRefreshInFlight = Promise.all([
+        this.menu.loadMenuList(),
+        this.schedule.loadAllSchedule()
+      ]).then(() => void 0).catch((error) => {
+        this.logWarning("刷新菜单/日程缓存失败，继续使用现有缓存", {
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }).finally(() => {
+        this.menuScheduleRefreshInFlight = null;
+      });
+    }
+    await this.menuScheduleRefreshInFlight;
+    return true;
+  }
   /**
    * 执行 sales 搜索并登记可见订单号。
    * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
@@ -3763,9 +3856,7 @@ var Server = class {
           checkoutData,
           order: pendingOrder,
           response: pendingResult,
-          requireFullyPaid: true,
-          // 自动小票固定使用 print_all 的收据类型 0，不随订单 type 改成券/手环类型 99。
-          isManualPrint: true
+          requireFullyPaid: true
         });
       }
       await this.dispatchCheckoutSyncTask({
@@ -3813,10 +3904,21 @@ var Server = class {
           data: (normalized == null ? void 0 : normalized.data) ?? null
         };
       }
-      return this.withSyncedOrderIdInCheckoutResponse(
+      const response = this.withSyncedOrderIdInCheckoutResponse(
         syncResult.normalizedResponse,
         syncResult.syncedOrder
       );
+      const syncedOrder = syncResult.syncedOrder;
+      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData) && this.isSalesOrderFullyPaid(syncedOrder)) {
+        await this.dispatchLocalReceiptPrint({
+          checkoutData: syncResult.checkoutData,
+          order: syncedOrder,
+          response: syncResult.normalizedResponse,
+          requireFullyPaid: true
+          // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
+        });
+      }
+      return response;
     } catch (error) {
       const backendError = this.extractBackendErrorResponse(error);
       if (backendError) {
@@ -3990,7 +4092,7 @@ var Server = class {
     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";
+    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)) !== "false";
   }
   shouldBuildSmallTicketData(order) {
     if (!order || typeof order !== "object")
@@ -5115,13 +5217,16 @@ var Server = class {
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
       const tMenu = performance.now();
-      const menuList = this.menu.getMenuByIds(menu_list_ids);
-      activeMenuList = menuList.filter((menu) => {
+      const getActiveMenus = () => this.menu.getMenuByIds(menu_list_ids).filter((menu) => {
         var _a;
         return ((_a = this.schedule) == null ? void 0 : _a.getDateIsInSchedule(schedule_datetime, menu.schedule)) || false;
       });
+      activeMenuList = getActiveMenus();
+      if (!activeMenuList.length && await this.refreshMenuScheduleCacheAfterEmptyResult()) {
+        activeMenuList = getActiveMenus();
+      }
       (0, import_product.perfMark)("computeQuery.filterActiveMenu", performance.now() - tMenu, {
-        totalMenu: menuList.length,
+        totalMenu: menu_list_ids.length,
         activeMenu: activeMenuList.length
       });
     }

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

@@ -235,6 +235,7 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private isRemoteProductMembershipChangeSource;
     private getProductMembershipKey;
     private doProductsHaveStableMembershipIdentity;
     /**
@@ -273,6 +274,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getPersistedOrderStorageKey;
     private getOrderIdentityMatchKeys;
     private doOrdersShareIdentity;
     private findOrderIndexByIdentity;

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

@@ -39,6 +39,7 @@ var import_orderCollectionIdentity = require("../../../modules/Order/utils/order
 var import_types = require("./types");
 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_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
 var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2e3;
@@ -920,10 +921,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) {
@@ -1530,6 +1534,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [];
     const remoteProductMembershipChanges = [];
     const forceWriteStorageKeys = /* @__PURE__ */ new Set();
+    const storageKeyMigrations = [];
     const mergeActions = {};
     const existingProductsHaveStableIdentity = this.store.list.map(
       (order) => this.doProductsHaveStableMembershipIdentity(
@@ -1554,6 +1559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
         const existingOrder = updatedList[matchIndex];
+        const previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
         if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
           this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
             source,
@@ -1615,6 +1621,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             }
           }
         }
+        const nextStorageKey = this.getOrderStorageKey(mergedOrder);
+        if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
+          storageKeyMigrations.push({
+            orderId: mergedOrder.order_id ?? existingOrder.order_id ?? fresh.order_id ?? null,
+            from: previousStorageKey,
+            to: nextStorageKey
+          });
+        }
         updatedList[adjustedMatchIndex] = mergedOrder;
         existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
         if (membershipChange) {
@@ -1652,7 +1666,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       patchedOrders,
       source,
       mergeActions,
-      {},
+      { storageKeyMigrations },
       forceWriteStorageKeys
     );
     this.logInfo("mergeOrdersToStore-结束", {
@@ -1685,6 +1699,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 +1734,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 : [];
@@ -1854,6 +1871,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return "";
   }
+  getPersistedOrderStorageKey(order) {
+    const persistedStorageKey = order == null ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
+    if (persistedStorageKey !== void 0 && persistedStorageKey !== null && persistedStorageKey !== "") {
+      return String(persistedStorageKey);
+    }
+    return this.getOrderStorageKey(order);
+  }
   getOrderIdentityMatchKeys(order) {
     return this.getOrderIdentityEntries(order).map((entry) => `${entry.field}:${entry.key}`);
   }
@@ -2284,7 +2308,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         throw new Error("订单 SQLite 数据库未初始化");
       return;
     }
-    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).filter((order) => this.getOrderStorageKey(order));
+    const migrationTargetStorageKeys = new Set(
+      (options.storageKeyMigrations || []).map((migration) => migration.to)
+    );
+    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || !migrationTargetStorageKeys.has(storageKey))
+        return order;
+      return {
+        ...order,
+        [ORDER_STORAGE_KEY_FIELD]: storageKey
+      };
+    }).filter((order) => this.getOrderStorageKey(order));
     if (ordersSnapshot.length === 0) {
       return;
     }
@@ -2301,6 +2336,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (compactedToWrite.length === 0) {
       return;
     }
+    const writtenStorageKeys = new Set(
+      compactedToWrite.map((order) => this.getOrderStorageKey(order)).filter(Boolean)
+    );
+    const storageKeyMigrations = /* @__PURE__ */ new Map();
+    for (const migration of options.storageKeyMigrations || []) {
+      if (!writtenStorageKeys.has(migration.to))
+        continue;
+      if (writtenStorageKeys.has(migration.from))
+        continue;
+      storageKeyMigrations.set(migration.from, migration);
+    }
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         let writeMethod = "none";
@@ -2324,6 +2370,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           throw new Error("订单 SQLite 数据库不支持写入");
         }
         this.recordRecentSqliteWrite(source, compactedToWrite);
+        if (writeMethod !== "none") {
+          for (const migration of storageKeyMigrations.values()) {
+            try {
+              await this.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+              this.recentSqliteWriteByStorageKey.delete(migration.from);
+              for (const order of orders) {
+                if (this.getOrderStorageKey(order) !== migration.to)
+                  continue;
+                const orderRecord = order;
+                if (String(orderRecord[ORDER_STORAGE_KEY_FIELD] ?? "") !== migration.from)
+                  continue;
+                orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
+              }
+            } catch (error) {
+              this.logError("删除订单旧 SQLite storage key 失败", {
+                source,
+                order_id: migration.orderId,
+                oldStorageKey: migration.from,
+                newStorageKey: migration.to,
+                error: error instanceof Error ? error.message : String(error)
+              });
+            }
+          }
+        }
         this.logInfo("patchOrdersInSQLite-完成", {
           source,
           count: compactedToWrite.length,

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

@@ -119,6 +119,15 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * application_code 仅作为接口兼容字段，不能替代 channel / business_code。
      */
     private getPriceQueryStrategyContext;
+    /**
+     * 子类可在商品重报价前准备客户维度的策略上下文，例如等待 Wallet/优惠资产加载。
+     */
+    protected prepareProductPriceQueryContext(_customerId?: number | string): Promise<void>;
+    /**
+     * 默认保留 BaseSales 的 legacy quotation 行为；已由 /product/query 统一完成
+     * 智能定价与报价合并的业务可在子类中覆盖，避免二次覆盖权威价格。
+     */
+    protected preferAuthoritativeProductQueryPrice(): boolean;
     private getPriceQuerySchedule;
     private loadProductsForPriceQuery;
     private loadProductForPriceQuery;
@@ -141,7 +150,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * const params = this.buildSubModuleOtherParams();
      * this.core.registerModule(orderModule, { otherParams: params });
      */
-    protected buildSubModuleOtherParams(): Record<string, any>;
+    protected isSessionStoragePersistEnabled(): boolean;
+    protected shouldUseSessionStorageForSubModule(_moduleName?: string): boolean;
+    protected buildSubModuleOtherParams(moduleName?: string): Record<string, any>;
     /**
      * 将父级 otherParams 的变更显式同步给已注册的子模块。
      *
@@ -290,6 +301,13 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
+    /**
+     * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
+     * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
+     */
+    protected shouldUseCheckoutSyncTask(): boolean;
+    /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
+    protected getDefaultCheckoutSmallTicketDataFlag(): number | undefined;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
     private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
@@ -427,6 +445,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     transformBaseProductToOrderProduct(params: TransformBaseProductToOrderProductParams): import("./utils/transformBaseProductToOrderProduct").BaseProductOrderProductInput | null;
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     getQuotationCustomerScopeInfo(): BaseSalesQuotationCustomerScopeInfo;
+    private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;