@pisell/pisellos 2.2.259 → 2.2.260

package/lib/modules/SurchargeList/index.js

@@ -25,17 +25,15 @@ __export(SurchargeList_exports, {
 module.exports = __toCommonJS(SurchargeList_exports);
 var import_BaseModule = require("../BaseModule");
 __reExport(SurchargeList_exports, require("./types"), module.exports);
-var DEFAULT_SURCHARGE_CHANNEL = "online-store";
 var SurchargeListModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "surchargeList";
     this.defaultVersion = "1.0.0";
-    this.loadingPromises = /* @__PURE__ */ new Map();
-    this.requestVersion = 0;
+    this.loadingPromise = null;
   }
   async initialize(core, options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     this.request = this.core.getPlugin("request");
@@ -43,62 +41,44 @@ var SurchargeListModule = class extends import_BaseModule.BaseModule {
       (_a = options.initialState) == null ? void 0 : _a.surchargeList
     );
     this.store.surchargeList = hasInitialSurchargeList ? (_b = options.initialState) == null ? void 0 : _b.surchargeList : [];
-    this.store.channel = ((_c = options.initialState) == null ? void 0 : _c.channel) || ((_d = options.otherParams) == null ? void 0 : _d.channel) || DEFAULT_SURCHARGE_CHANNEL;
-    this.store.isLoaded = Boolean((_e = options.initialState) == null ? void 0 : _e.isLoaded) || hasInitialSurchargeList;
+    this.store.isLoaded = Boolean((_c = options.initialState) == null ? void 0 : _c.isLoaded) || hasInitialSurchargeList;
     if (!this.request) {
       throw new Error("SurchargeListModule 需要 request 插件支持");
     }
   }
-  resolveChannel(query) {
-    return (query == null ? void 0 : query.channel) || DEFAULT_SURCHARGE_CHANNEL;
-  }
-  async getSurchargeList(query) {
-    const channel = this.resolveChannel(query);
-    if (this.store.isLoaded && this.store.channel === channel) {
+  async getSurchargeList() {
+    if (this.store.isLoaded)
       return this.store.surchargeList;
-    }
-    const loadingPromise = this.loadingPromises.get(channel);
-    if (loadingPromise)
-      return loadingPromise;
-    const nextPromise = this.loadSurchargeList(channel);
-    this.loadingPromises.set(channel, nextPromise);
-    return nextPromise;
+    if (this.loadingPromise)
+      return this.loadingPromise;
+    this.loadingPromise = this.loadSurchargeList();
+    return this.loadingPromise;
   }
-  async refreshSurchargeList(query) {
-    const channel = this.resolveChannel(query);
-    const nextPromise = this.loadSurchargeList(channel);
-    this.loadingPromises.set(channel, nextPromise);
-    return nextPromise;
+  async refreshSurchargeList() {
+    this.loadingPromise = this.loadSurchargeList();
+    return this.loadingPromise;
   }
-  async loadSurchargeList(channel) {
-    const currentRequestVersion = ++this.requestVersion;
+  async loadSurchargeList() {
     try {
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
-          channel,
+          channel: "online-store",
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
           with: ["relationSchedule"]
         }
       );
-      const nextSurchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
-      if (currentRequestVersion === this.requestVersion) {
-        this.store.surchargeList = nextSurchargeList;
-        this.store.channel = channel;
-        this.store.isLoaded = true;
-      }
-      return nextSurchargeList;
+      this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
+      this.store.isLoaded = true;
+      return this.store.surchargeList;
     } catch (error) {
       console.warn("[SurchargeListModule] 加载附加费配置失败", error);
-      if (currentRequestVersion === this.requestVersion) {
-        this.store.surchargeList = [];
-        this.store.channel = channel;
-        this.store.isLoaded = true;
-      }
-      return [];
+      this.store.surchargeList = [];
+      this.store.isLoaded = true;
+      return this.store.surchargeList;
     } finally {
-      this.loadingPromises.delete(channel);
+      this.loadingPromise = null;
     }
   }
 };

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

@@ -4,12 +4,8 @@ export interface SurchargeListItem {
 export interface SurchargeListState {
     surchargeList: SurchargeListItem[];
     isLoaded: boolean;
-    channel?: string;
-}
-export interface SurchargeListQuery {
-    channel?: string;
 }
 export interface SurchargeListModuleAPI {
-    getSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
-    refreshSurchargeList(query?: SurchargeListQuery): Promise<SurchargeListItem[]>;
+    getSurchargeList(): Promise<SurchargeListItem[]>;
+    refreshSurchargeList(): Promise<SurchargeListItem[]>;
 }

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;
@@ -210,6 +212,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;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -431,9 +475,6 @@ declare class Server {
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
     private handleLocalPrintOrder;
-    private handleMachinecodeBatchMeta;
-    private resolveMachinecodeBatchMetadataLookup;
-    private syncMachinecodeRedeemStatusToLocalOrder;
     private handleOrderCheckoutSubmit;
     private handleSyncCheckoutSubmit;
     private handlePendingSyncCheckoutOrder;
@@ -565,6 +606,12 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
+    /**
+     * 构建商品格式化上下文。
+     *
+     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
+     */
+    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发