@pisell/pisellos 2.3.24 → 2.3.25

package/lib/modules/Order/index.js

@@ -308,9 +308,6 @@ 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");
     const appPlugin = this.core.getPlugin("app");
     if (!appPlugin) {
@@ -438,19 +435,15 @@ 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 prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+    const discountList = 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);
@@ -484,8 +477,18 @@ 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);
+    if (!scanDiscounts.length)
+      return;
+    const scanDiscountIds = new Set(scanDiscounts.map((discount) => discount == null ? void 0 : discount.id));
+    const originalDiscounts = ((_b = (_a = this.store.discount) == null ? void 0 : _a.getOriginalDiscountList) == null ? void 0 : _b.call(_a)) || [];
+    const nextOriginalDiscounts = [
+      ...scanDiscounts,
+      ...originalDiscounts.filter((discount) => !scanDiscountIds.has(discount == null ? void 0 : discount.id))
+    ];
+    await ((_d = (_c = this.store.discount) == null ? void 0 : _c.setOriginalDiscountList) == null ? void 0 : _d.call(_c, nextOriginalDiscounts));
   }
   async ensureEditDiscountConfigForProductChange(tempOrder) {
     var _a, _b, _c, _d, _e, _f;
@@ -535,6 +538,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }));
     const currentSelected = this.getDiscountList().filter((n) => n.isSelected);
     if (currentSelected.length && currentSelected.some((n) => withScanList.some((m) => m.id === n.id))) {
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
         type: "clientCalc",
         isAvailable: true,
@@ -555,6 +559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (isAvailable && newDiscountList) {
       (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
       this.applyDiscount();
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
     }
     return {
       type: "clientCalc",
@@ -2366,7 +2371,6 @@ 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();
@@ -2406,7 +2410,6 @@ 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();
@@ -3998,7 +4001,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async hydrateTempOrderFromRecord(record, options) {
     var _a, _b, _c;
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
-    const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+    const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
     this.store.tempOrder = nextTempOrder;
@@ -4021,14 +4024,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.lastOrderInfo = raw.lastOrderInfo || raw;
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
     const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
-    const shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
+    const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
+    const hydratedDiscountIds = new Set(
+      hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+    );
+    const retainedScanDiscounts = currentScanDiscounts.filter(
+      (discount) => !hydratedDiscountIds.has(discount == null ? void 0 : discount.id)
+    );
+    const nextDiscounts = [
+      ...hydratedEditDiscounts,
+      ...retainedScanDiscounts
+    ];
+    const shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
     if (!shouldSkipEmptyDiscountSync) {
       OrderModule.populateSavedAmounts(
         nextTempOrder.products,
-        hydratedEditDiscounts
+        nextDiscounts
       );
-      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
-      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(nextDiscounts));
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(nextDiscounts));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });
@@ -4085,7 +4099,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === "object" ? { ...raw.metadata } : {};
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
     const rawProducts = Array.isArray(raw.products) ? raw.products : [];
-    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
+    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p, { makeEditMark: options == null ? void 0 : options.makeEditMark })) : [];
     nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => {
       const booking = this.normalizeHydratedBookingHolder(b || {});
       return {
@@ -4231,7 +4245,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalized.id = optionItem.id;
     return normalized;
   }
-  normalizeHydratedOrderProduct(product) {
+  normalizeHydratedOrderProduct(product, options) {
     let row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
@@ -4258,7 +4272,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!existingIdentity) {
       row.metadata.unique_identification_number = (0, import_utils.createUuidV4)();
     }
-    row.metadata.is_edit_for_runtime = true;
+    if (options == null ? void 0 : options.makeEditMark) {
+      row.metadata.is_edit_for_runtime = true;
+    }
     const normalized = (0, import_utils3.normalizeOrderProduct)(row);
     normalized.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalized.discount_list

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

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

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

@@ -9,26 +9,6 @@ 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;
-}
 /**
  * 商品基本信息接口
  */
@@ -234,8 +214,6 @@ 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, strategy_context, }?: 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, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/lib/modules/ProductList/index.js

@@ -95,8 +95,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule,
     extension_type,
-    status = "published",
-    strategy_context
+    status = "published"
   } = {}, options) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
@@ -136,8 +135,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
         is_eject: 1,
         with_schedule,
         schedule_datetime,
-        extension_type,
-        strategy_context
+        extension_type
       },
       { 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,8 +12,6 @@ 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,8 +47,6 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
-    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
-    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -212,48 +210,6 @@ 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;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -614,12 +570,6 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
-    /**
-     * 构建商品格式化上下文。
-     *
-     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
-     */
-    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发

package/lib/server/index.js

@@ -76,8 +76,6 @@ 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();
@@ -210,7 +208,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, strategy_context } = data;
+      const { menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, extension_type } = data;
       const { callback, subscriberId } = config || {};
       this.logInfo("handleProductQuery: 开始处理商品查询请求", {
         menu_list_ids,
@@ -218,32 +216,19 @@ var Server = class {
         schedule_datetime,
         schedule_date,
         customer_id,
-        extension_type,
-        strategyContextKeys: strategy_context ? Object.keys(strategy_context) : []
+        extension_type
       });
       if (subscriberId && typeof callback === "function") {
         this.productQuerySubscribers.set(subscriberId, {
           callback,
-          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, strategy_context }
+          context: { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type }
         });
         this.logInfo("handleProductQuery: 已注册订阅者", {
           subscriberId,
           totalSubscribers: this.productQuerySubscribers.size
         });
       }
-      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;
+      return this.computeProductQueryResult({ menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type });
     };
     /**
      * 按商品 id 查询单条（GET /shop/product/query/:productId）
@@ -1926,7 +1911,6 @@ var Server = class {
    */
   removeProductQuerySubscriber(subscriberId) {
     if (subscriberId) {
-      this.clearSubscriberScheduleTimers(subscriberId);
       this.productQuerySubscribers.delete(subscriberId);
       this.logInfo("removeProductQuerySubscriber: 已移除订阅者", {
         subscriberId,
@@ -1934,156 +1918,6 @@ 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 不做过滤、筛选、排序。
@@ -4277,14 +4111,8 @@ 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, strategy_context } = context;
+    const { menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, extension_type, product_id } = 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,
@@ -4293,17 +4121,20 @@ 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: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Products 模块未注册", data: { list: [], count: 0 } };
     }
     if (queryIds.length > 0) {
       const uniqueIds = Array.from(new Set(queryIds));
       const tPrice2 = performance.now();
-      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      const productsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
         changedIds: options == null ? void 0 : options.changedIds,
         productIds: uniqueIds
       });
@@ -4324,7 +4155,7 @@ var Server = class {
       });
       return {
         code: 200,
-        data: this.buildProductQueryResultPayload(extensionFilteredProducts),
+        data: { list: extensionFilteredProducts, count: extensionFilteredProducts.length },
         message: "",
         status: true
       };
@@ -4332,7 +4163,9 @@ 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, formatterContext, {
+      const allProductsWithPrice = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule()
+      }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(single)", performance.now() - tPrice2, {
@@ -4362,7 +4195,11 @@ var Server = class {
     }
     if (this.shouldQueryProductsByExtensionTypes(extension_type)) {
       const tPrice2 = performance.now();
-      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+      let filteredProducts2 = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule(),
+        schedule_datetime,
+        customer_id
+      }, {
         changedIds: options == null ? void 0 : options.changedIds
       });
       (0, import_product.perfMark)("computeQuery.getProductsWithPrice(extensionType)", performance.now() - tPrice2, {
@@ -4402,18 +4239,18 @@ var Server = class {
       });
       return {
         code: 200,
-        data: this.buildProductQueryResultPayload(filteredProducts2),
+        data: { list: filteredProducts2, count: filteredProducts2.length },
         message: "",
         status: true
       };
     }
     if (!this.menu) {
       this.logError("computeProductQueryResult: Menu 模块未注册");
-      return { message: "Menu 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Menu 模块未注册", data: { list: [], count: 0 } };
     }
     if (!this.schedule) {
       this.logError("computeProductQueryResult: Schedule 模块未注册");
-      return { message: "Schedule 模块未注册", data: this.buildProductQueryResultPayload([], 0) };
+      return { message: "Schedule 模块未注册", data: { list: [], count: 0 } };
     }
     let activeMenuList = [];
     if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
@@ -4437,7 +4274,11 @@ var Server = class {
       isAllProducts: !!productScope.isAllProducts
     });
     const tPrice = performance.now();
-    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, formatterContext, {
+    let filteredProducts = scopedProductIds.length > 0 ? await this.products.getProductsWithPrice(schedule_date, {
+      scheduleModule: this.getSchedule(),
+      schedule_datetime,
+      customer_id
+    }, {
       changedIds: options == null ? void 0 : options.changedIds,
       productIds: productScope.isAllProducts ? void 0 : scopedProductIds
     }) : [];
@@ -4480,29 +4321,11 @@ var Server = class {
     });
     return {
       code: 200,
-      data: this.buildProductQueryResultPayload(filteredProducts),
+      data: { list: filteredProducts, count: filteredProducts.length },
       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 事件触发