@pisell/pisellos 2.3.30 → 2.3.32

package/lib/modules/Discount/types.d.ts

@@ -68,6 +68,10 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface DiscountPrepareConfigResult {
+    discountList: Discount[];
+    availableWalletIds: number[];
+}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -76,6 +76,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         apply?: boolean;
     }): Promise<Discount[]>;
     getDiscountList(): Discount[];
+    getAvailableWalletIds(): number[];
     private syncScannedDiscountsToOriginalDiscountList;
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
@@ -484,7 +485,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -311,6 +311,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!this.store.summary) {
       this.store.summary = (0, import_utils.createEmptySummary)();
     }
+    if (!Array.isArray(this.store.availableWalletIds)) {
+      this.store.availableWalletIds = [];
+    }
     this.request = this.core.getPlugin("request");
     this.appPlugin = this.core.getPlugin("app");
     if (!this.appPlugin) {
@@ -438,15 +441,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async loadDiscountConfig(params) {
     var _a, _b, _c, _d, _e, _f, _g;
     const orderId = params.orderId || ((_a = this.store.tempOrder) == null ? void 0 : _a.order_id) || void 0;
-    const discountList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+    const prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
       customer_id: params.customerId,
       action: params.action || (orderId ? "edit" : "create"),
       with_good_pass: 1,
       with_discount_card: 1,
       with_wallet_pass_holder: 1,
+      with_available_wallet_flag: 1,
+      with_available_wallet_pass_flag: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       ...orderId ? { order_id: orderId } : {}
     }));
+    const discountList = prepareConfigResult == null ? void 0 : prepareConfigResult.discountList;
+    this.store.availableWalletIds = (prepareConfigResult == null ? void 0 : prepareConfigResult.availableWalletIds) || [];
     if (discountList) {
       const currentDiscountList = ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || [];
       const currentEditDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isEditMode);
@@ -480,6 +487,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
+  getAvailableWalletIds() {
+    return Array.isArray(this.store.availableWalletIds) ? [...this.store.availableWalletIds] : [];
+  }
   async syncScannedDiscountsToOriginalDiscountList(discountList) {
     var _a, _b, _c, _d;
     const scanDiscounts = (discountList || []).filter((discount) => discount == null ? void 0 : discount.isScan);
@@ -2427,6 +2437,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? "") !== String(nextCustomerId ?? "")) {
+      this.store.availableWalletIds = [];
       (0, import_utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
@@ -2466,6 +2477,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.customer = null;
     if (tempOrder._extend)
       delete tempOrder._extend.customerSnapshot;
+    this.store.availableWalletIds = [];
     this.clearCustomerBoundDiscounts(tempOrder);
     this.persistTempOrder();
     this.saveDraftInBackground();

package/lib/modules/Order/types.d.ts

@@ -309,6 +309,7 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
+    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -807,6 +808,7 @@ export interface OrderModuleAPI {
         apply?: boolean;
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
+    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Product/types.d.ts

@@ -9,6 +9,26 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
+/**
+ * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
+ */
+export interface ProductDataVariant {
+    /** 变体记录 id */
+    id: number;
+    /** 店铺 id */
+    shop_id: number;
+    /** 所属模块，商品场景固定为 product */
+    module: string;
+    /** 模块数据 id，商品场景对应 product.id */
+    module_data_id: number;
+    /** 关联 data_variant_rule.id */
+    data_variant_rule_id: number;
+    /** 命中策略后覆盖到商品上的字段 */
+    data: Record<string, any>;
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 /**
  * 商品基本信息接口
  */
@@ -214,6 +234,8 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
+    /** 智能定价变体列表，/product/query with dataVariants 返回 */
+    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
 }

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

@@ -26,7 +26,7 @@ export declare class ProductList extends BaseModule implements Module {
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
     getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/lib/modules/ProductList/index.js

@@ -95,7 +95,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule,
     extension_type,
-    status = "published"
+    status = "published",
+    strategy_context
   } = {}, options) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
@@ -135,7 +136,8 @@ var ProductList = class extends import_BaseModule.BaseModule {
         is_eject: 1,
         with_schedule,
         schedule_datetime,
-        extension_type
+        extension_type,
+        strategy_context
       },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }

package/lib/modules/ProductList/types.d.ts

@@ -12,6 +12,8 @@ export interface ProductListLoadProductsParams {
     with_schedule?: number;
     extension_type?: string[];
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 export interface ProductListData {
     list: ProductData[];

package/lib/server/index.d.ts

@@ -47,6 +47,8 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
+    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
+    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -211,6 +213,48 @@ declare class Server {
      * 根据 subscriberId 移除商品查询订阅者
      */
     removeProductQuerySubscriber(subscriberId?: string): void;
+    /**
+     * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
+     */
+    private buildProductQueryResultPayload;
+    /**
+     * 是否启用商品 query 订阅的 schedule 时间点定时重算。
+     * strategy_context.enable_schedule_reload === false 时关闭。
+     */
+    private shouldScheduleProductQueryReload;
+    /**
+     * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
+     */
+    private clearSubscriberScheduleTimers;
+    /**
+     * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
+     */
+    private removeScheduleTimerRef;
+    /**
+     * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
+     */
+    private computeScheduleTimePointDelayMs;
+    /**
+     * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
+     */
+    private refreshSubscriberScheduleAtExecution;
+    /**
+     * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
+     * 必须先 clearSubscriberScheduleTimers，再调用本方法。
+     */
+    private scheduleSubscriberTimePointReloads;
+    /**
+     * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
+     */
+    private onScheduleTimePointTimerFire;
+    /**
+     * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
+     */
+    private recomputeAndNotifySubscriber;
+    /**
+     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
+     */
+    private syncProductQueryScheduleTimers;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -584,6 +628,12 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
+    /**
+     * 构建商品格式化上下文。
+     *
+     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
+     */
+    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发

package/lib/server/index.js

@@ -78,6 +78,8 @@ var Server = class {
     };
     // ---- 商品查询订阅者 ----
     this.productQuerySubscribers = /* @__PURE__ */ new Map();
+    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
+    this.productQueryScheduleTimers = /* @__PURE__ */ new Map();
     // ---- 订单 / 预约列表查询订阅者 ----
     this.orderQuerySubscribers = /* @__PURE__ */ new Map();
     this.bookingQuerySubscribers = /* @__PURE__ */ new Map();
@@ -211,7 +213,7 @@ 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 } = data;
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type, strategy_context } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -219,19 +221,32 @@ var Server = class {
         schedule_datetime,
         schedule_date,
         customer_id,
-        extension_type
+        extension_type,
+        strategyContextKeys: strategy_context ? Object.keys(strategy_context) : []
       });
       if (subscriberId && typeof callback === "function") {
         this.productQuerySubscribers.set(subscriberId, {
           callback,
-          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type }
+          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, strategy_context }
         });
         this.logInfo("handleProductQuery: 已注册订阅者", {
           subscriberId,
           totalSubscribers: this.productQuerySubscribers.size
         });
       }
-      return this.computeProductQueryResult({ menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type });
+      const result = await this.computeProductQueryResult({
+        menu_list_ids,
+        ids,
+        schedule_date,
+        schedule_datetime,
+        customer_id,
+        extension_type,
+        strategy_context
+      });
+      if (subscriberId && typeof callback === "function") {
+        this.syncProductQueryScheduleTimers(subscriberId, strategy_context);
+      }
+      return result;
     };
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
@@ -2054,6 +2069,7 @@ var Server = class {
    */
   removeProductQuerySubscriber(subscriberId) {
     if (subscriberId) {
+      this.clearSubscriberScheduleTimers(subscriberId);
       this.productQuerySubscribers.delete(subscriberId);
       this.logInfo("removeProductQuerySubscriber: 已移除订阅者", {
         subscriberId,
@@ -2061,6 +2077,156 @@ var Server = class {
       });
     }
   }
+  /**
+   * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
+   */
+  buildProductQueryResultPayload(list, count) {
+    var _a, _b;
+    return {
+      list,
+      count: count ?? list.length,
+      schedule_time_points: ((_b = (_a = this.products) == null ? void 0 : _a.getLastScheduleTimePoints) == null ? void 0 : _b.call(_a)) ?? []
+    };
+  }
+  /**
+   * 是否启用商品 query 订阅的 schedule 时间点定时重算。
+   * strategy_context.enable_schedule_reload === false 时关闭。
+   */
+  shouldScheduleProductQueryReload(strategy_context) {
+    return (strategy_context == null ? void 0 : strategy_context.enable_schedule_reload) !== false;
+  }
+  /**
+   * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
+   */
+  clearSubscriberScheduleTimers(subscriberId) {
+    const timers = this.productQueryScheduleTimers.get(subscriberId);
+    if (timers == null ? void 0 : timers.length) {
+      timers.forEach((timerId) => clearTimeout(timerId));
+    }
+    this.productQueryScheduleTimers.delete(subscriberId);
+    const subscriber = this.productQuerySubscribers.get(subscriberId);
+    if (subscriber) {
+      subscriber.scheduleTimerIds = [];
+    }
+  }
+  /**
+   * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
+   */
+  removeScheduleTimerRef(subscriberId, timerId) {
+    const timers = this.productQueryScheduleTimers.get(subscriberId);
+    if (!(timers == null ? void 0 : timers.length))
+      return;
+    const next = timers.filter((id) => id !== timerId);
+    if (next.length === 0) {
+      this.productQueryScheduleTimers.delete(subscriberId);
+    } else {
+      this.productQueryScheduleTimers.set(subscriberId, next);
+    }
+    const subscriber = this.productQuerySubscribers.get(subscriberId);
+    if (subscriber) {
+      subscriber.scheduleTimerIds = next;
+    }
+  }
+  /**
+   * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
+   */
+  computeScheduleTimePointDelayMs(scheduleDate, timePoint) {
+    const parts = timePoint.split(":");
+    if (parts.length < 2)
+      return -1;
+    const hours = parseInt(parts[0], 10);
+    const minutes = parseInt(parts[1], 10);
+    if (!Number.isFinite(hours) || !Number.isFinite(minutes))
+      return -1;
+    const target = (0, import_dayjs.default)(scheduleDate).hour(hours).minute(minutes).second(4).millisecond(0);
+    const delayMs = target.diff((0, import_dayjs.default)());
+    return delayMs >= 0 ? delayMs : -1;
+  }
+  /**
+   * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
+   */
+  refreshSubscriberScheduleAtExecution(subscriber) {
+    const executedAt = (0, import_dayjs.default)();
+    const bookingDate = subscriber.context.schedule_date || executedAt.format("YYYY-MM-DD");
+    subscriber.context.schedule_date = bookingDate;
+    subscriber.context.schedule_datetime = `${bookingDate} ${executedAt.format("HH:mm:ss")}`;
+  }
+  /**
+   * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
+   * 必须先 clearSubscriberScheduleTimers，再调用本方法。
+   */
+  scheduleSubscriberTimePointReloads(subscriberId, timePoints) {
+    const subscriber = this.productQuerySubscribers.get(subscriberId);
+    if (!subscriber || !timePoints.length)
+      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);
+    }
+    if (timerIds.length > 0) {
+      this.productQueryScheduleTimers.set(subscriberId, timerIds);
+      subscriber.scheduleTimerIds = timerIds;
+      this.logInfo("scheduleSubscriberTimePointReloads: 已注册定时器", {
+        subscriberId,
+        timerCount: timerIds.length,
+        timePoints
+      });
+    }
+  }
+  /**
+   * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
+   */
+  async onScheduleTimePointTimerFire(subscriberId, timerId) {
+    this.removeScheduleTimerRef(subscriberId, timerId);
+    if (!this.productQuerySubscribers.has(subscriberId))
+      return;
+    const subscriber = this.productQuerySubscribers.get(subscriberId);
+    this.refreshSubscriberScheduleAtExecution(subscriber);
+    await this.recomputeAndNotifySubscriber(subscriberId);
+  }
+  /**
+   * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
+   */
+  async recomputeAndNotifySubscriber(subscriberId) {
+    const subscriber = this.productQuerySubscribers.get(subscriberId);
+    if (!subscriber)
+      return;
+    try {
+      const result = await this.computeProductQueryResult(subscriber.context);
+      subscriber.callback(result);
+      this.logInfo("recomputeAndNotifySubscriber: 已推送", {
+        subscriberId,
+        schedule_datetime: subscriber.context.schedule_datetime
+      });
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError("recomputeAndNotifySubscriber: 推送失败", {
+        subscriberId,
+        error: errorMessage
+      });
+    }
+  }
+  /**
+   * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
+   */
+  syncProductQueryScheduleTimers(subscriberId, 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)) ?? [];
+    if (timePoints.length > 0) {
+      this.scheduleSubscriberTimePointReloads(subscriberId, timePoints);
+    }
+  }
   /**
    * 执行 sales 搜索并登记可见订单号。
    * 搜索参数完全透传后端，OS 不做过滤、筛选、排序。
@@ -4707,8 +4873,14 @@ var Server = class {
    */
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
-    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id } = context;
+    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,
@@ -4717,20 +4889,17 @@ var Server = class {
       customer_id,
       extension_type,
       product_id,
+      strategyContextKeys: strategy_context ? Object.keys(strategy_context) : [],
       changedIds: options == null ? void 0 : options.changedIds
     });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
-      return { message: "Products 模块未注册", data: { list: [], count: 0 } };
+      return { message: "Products 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
     }
     if (queryIds.length > 0) {
       const uniqueIds = Array.from(new Set(queryIds));
       const tPrice2 = performance.now();
-      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
-        scheduleModule: this.getSchedule(),
-        schedule_datetime,
-        customer_id
-      }, {
+      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
         changedIds: options == null ? void 0 : options.changedIds,
         productIds: uniqueIds
       });
@@ -4751,7 +4920,7 @@ var Server = class {
       });
       return {
         code: 200,
-        data: { list: extensionFilteredProducts, count: extensionFilteredProducts.length },
+        data: this.buildProductQueryResultPayload(extensionFilteredProducts),
         message: "",
         status: true
       };
@@ -4759,9 +4928,7 @@ var Server = class {
     if (product_id != null && Number.isFinite(Number(product_id))) {
       const pid = Number(product_id);
       const tPrice2 = performance.now();
-      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
-        scheduleModule: this.getSchedule()
-      }, {
+      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(single)", performance.now() - tPrice2, {
@@ -4791,11 +4958,7 @@ var Server = class {
     }
     if (this.shouldQueryProductsByExtensionTypes(extension_type)) {
       const tPrice2 = performance.now();
-      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, {
-        scheduleModule: this.getSchedule(),
-        schedule_datetime,
-        customer_id
-      }, {
+      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(extensionType)", performance.now() - tPrice2, {
@@ -4835,18 +4998,18 @@ var Server = class {
       });
       return {
         code: 200,
-        data: { list: filteredProducts2, count: filteredProducts2.length },
+        data: this.buildProductQueryResultPayload(filteredProducts2),
         message: "",
         status: true
       };
     }
     if (!this.menu) {
       this.logError("computeProductQueryResult: Menu 模块未注册");
-      return { message: "Menu 模块未注册", data: { list: [], count: 0 } };
+      return { message: "Menu 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
     }
     if (!this.schedule) {
       this.logError("computeProductQueryResult: Schedule 模块未注册");
-      return { message: "Schedule 模块未注册", data: { list: [], count: 0 } };
+      return { message: "Schedule 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
     }
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
@@ -4870,11 +5033,7 @@ var Server = class {
       isAllProducts: !!productScope.isAllProducts
     });
     const tPrice = performance.now();
-    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, {
-      scheduleModule: this.getSchedule(),
-      schedule_datetime,
-      customer_id
-    }, {
+    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, formatterContext, {
       changedIds: options == null ? void 0 : options.changedIds,
       productIds: productScope.isAllProducts ? void 0 : scopedProductIds
     }) : [];
@@ -4917,11 +5076,29 @@ var Server = class {
     });
     return {
       code: 200,
-      data: { list: filteredProducts, count: filteredProducts.length },
+      data: this.buildProductQueryResultPayload(filteredProducts),
       message: "",
       status: true
     };
   }
+  /**
+   * 构建商品格式化上下文。
+   *
+   * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
+   */
+  buildProductFormatterContext(context) {
+    var _a, _b, _c, _d;
+    const scheduleModule = this.getSchedule();
+    return {
+      scheduleModule,
+      schedule_datetime: context.schedule_datetime,
+      customer_id: context.customer_id,
+      strategy_context: context.strategy_context,
+      menuList: ((_b = (_a = this.menu) == null ? void 0 : _a.getMenuList) == null ? void 0 : _b.call(_a)) || [],
+      scheduleList: ((_c = scheduleModule == null ? void 0 : scheduleModule.getScheduleList) == null ? void 0 : _c.call(scheduleModule)) || [],
+      dataVariantEvaluator: (_d = this.core.context) == null ? void 0 : _d.dataVariantEvaluator
+    };
+  }
   /**
    * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
    * 由 ProductsModule 的 onProductsSyncCompleted 事件触发

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

@@ -123,6 +123,9 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     silentRefresh(): Promise<OrderData[]>;
     private normalizeOrderForMemoryList;
+    private normalizeOrdersForMemoryList;
+    private hasRealOrderId;
+    private shouldKeepOrderInMemory;
     private withoutSyntheticDraftOrderId;
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。
@@ -151,8 +154,8 @@ export declare class OrderModule extends BaseModule implements Module {
         throwOnError?: boolean;
     }): Promise<void>;
     /**
-     * 将 POS 草稿订单按 SQLite storage key 合并进 store 并落库。
-     * 草稿只表示本地可恢复快照，不进入同步队列。
+     * 将 POS 草稿订单按 SQLite storage key 落库。
+     * 只有具备真实 order_id 的草稿进入 store；其余草稿仅供本地恢复查询。
      */
     upsertLocalDraftOrders(draftOrders: OrderData[]): Promise<void>;
     /**
@@ -276,6 +279,7 @@ export declare class OrderModule extends BaseModule implements Module {
     private isDraftOrder;
     private shouldProtectDraftOrderFromIncoming;
     private normalizeRemoteSyncedOrder;
+    private mergeRemoteIdentityIntoDraftOrder;
     private mergeRemoteSnapshotWithPendingOrders;
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
@@ -301,7 +305,8 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private updateOrderInSQLite;
     /**
-     * 全量快照替换 orders 表（clear + bulkAdd），用于 SSE 全量拉取与营业日窗口裁剪。
+     * 全量快照替换 orders 表（clear + bulkAdd），并保留本地 draft / need_sync 订单。
+     * 用于 SSE 全量拉取与营业日窗口裁剪。
      *
      * @example
      * await this.replaceOrdersSnapshotInSQLite(orderList)