@pisell/pisellos 2.2.261 → 2.2.262

package/lib/server/index.js

@@ -76,6 +76,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();
@@ -208,7 +210,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,
@@ -216,19 +218,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）
@@ -769,12 +784,13 @@ var Server = class {
       if (!this.shouldForceRemoteSalesDetail(data)) {
         const localOrder = await this.order.getLocalOrderByLookup(lookup);
         if (localOrder) {
+          const enrichedOrder = await this.withSalesDetailProductSnapshots(localOrder);
           this.logInfo("handleOrderSalesDetail: 命中本地订单", { lookup });
           return {
             code: 200,
             status: true,
             message: "",
-            data: localOrder
+            data: enrichedOrder
           };
         }
       }
@@ -821,11 +837,12 @@ var Server = class {
           };
         }
         this.logInfo("handleOrderSalesDetail: 远端订单已同步到本地", { lookup });
+        const enrichedOrder = await this.withSalesDetailProductSnapshots(savedOrder);
         return {
           code: 200,
           status: true,
           message: "",
-          data: savedOrder
+          data: enrichedOrder
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1909,6 +1926,7 @@ var Server = class {
    */
   removeProductQuerySubscriber(subscriberId) {
     if (subscriberId) {
+      this.clearSubscriberScheduleTimers(subscriberId);
       this.productQuerySubscribers.delete(subscriberId);
       this.logInfo("removeProductQuerySubscriber: 已移除订阅者", {
         subscriberId,
@@ -1916,6 +1934,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 不做过滤、筛选、排序。
@@ -3231,6 +3399,123 @@ var Server = class {
       return map;
     }, {});
   }
+  collectSalesDetailProductIds(order) {
+    const products = Array.isArray(order == null ? void 0 : order.products) ? order.products : [];
+    const productIds = /* @__PURE__ */ new Set();
+    const addProductId = (rawProductId) => {
+      if (rawProductId === void 0 || rawProductId === null || rawProductId === "")
+        return;
+      const productId = Number(rawProductId);
+      if (Number.isFinite(productId))
+        productIds.add(productId);
+    };
+    products.forEach((product) => {
+      addProductId((product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id));
+      if (Array.isArray(product == null ? void 0 : product.product_bundle)) {
+        product.product_bundle.forEach((bundle) => {
+          addProductId((bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id));
+        });
+      }
+    });
+    return Array.from(productIds);
+  }
+  async buildSalesDetailProductSnapshotMap(order) {
+    var _a;
+    const productIds = this.collectSalesDetailProductIds(order);
+    const getSnapshots = (_a = this.products) == null ? void 0 : _a.getProductSnapshotsByIds;
+    if (!productIds.length || typeof getSnapshots !== "function")
+      return {};
+    try {
+      return await getSnapshots.call(this.products, productIds);
+    } catch (error) {
+      this.logWarning("buildSalesDetailProductSnapshotMap: 查询本地商品快照失败", {
+        product_ids: productIds,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return {};
+    }
+  }
+  withProductCatalogSnapshots(product, snapshotMap) {
+    if (!product || typeof product !== "object")
+      return product;
+    const rawProductId = (product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id);
+    if (rawProductId === void 0 || rawProductId === null || rawProductId === "")
+      return product;
+    const productId = Number(rawProductId);
+    if (!Number.isFinite(productId))
+      return product;
+    const snapshot = snapshotMap[String(productId)];
+    if (!snapshot)
+      return product;
+    const shouldFillCover = (product.product_cover === void 0 || product.product_cover === null || product.product_cover === "") && snapshot.cover !== void 0 && snapshot.cover !== null && snapshot.cover !== "";
+    const metadata = product.metadata && typeof product.metadata === "object" ? product.metadata : {};
+    const shouldFillHolderConfig = (metadata.holder_config === void 0 || metadata.holder_config === null) && snapshot.holder_config !== void 0 && snapshot.holder_config !== null;
+    if (!shouldFillCover && !shouldFillHolderConfig)
+      return product;
+    return {
+      ...product,
+      ...shouldFillCover ? { product_cover: snapshot.cover } : {},
+      ...shouldFillHolderConfig ? {
+        metadata: {
+          ...metadata,
+          holder_config: snapshot.holder_config
+        }
+      } : {}
+    };
+  }
+  withBundleCatalogSnapshots(product, snapshotMap) {
+    if (!Array.isArray(product == null ? void 0 : product.product_bundle))
+      return product;
+    let hasChanged = false;
+    const productBundle = product.product_bundle.map((bundle) => {
+      if (!bundle || typeof bundle !== "object")
+        return bundle;
+      const rawProductId = (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id);
+      if (rawProductId === void 0 || rawProductId === null || rawProductId === "")
+        return bundle;
+      const productId = Number(rawProductId);
+      if (!Number.isFinite(productId))
+        return bundle;
+      const snapshot = snapshotMap[String(productId)];
+      const shouldFillCover = (bundle.cover === void 0 || bundle.cover === null || bundle.cover === "") && (snapshot == null ? void 0 : snapshot.cover) !== void 0 && snapshot.cover !== null && snapshot.cover !== "";
+      if (!shouldFillCover)
+        return bundle;
+      hasChanged = true;
+      return {
+        ...bundle,
+        cover: snapshot.cover
+      };
+    });
+    if (!hasChanged)
+      return product;
+    return {
+      ...product,
+      product_bundle: productBundle
+    };
+  }
+  async withSalesDetailProductSnapshots(order) {
+    const products = Array.isArray(order == null ? void 0 : order.products) ? order.products : null;
+    if (!(products == null ? void 0 : products.length))
+      return order;
+    const snapshotMap = await this.buildSalesDetailProductSnapshotMap(order);
+    if (!Object.keys(snapshotMap).length)
+      return order;
+    let hasChanged = false;
+    const enrichedProducts = products.map((product) => {
+      const productWithBundleSnapshots = this.withBundleCatalogSnapshots(product, snapshotMap);
+      const nextProduct = this.withProductCatalogSnapshots(productWithBundleSnapshots, snapshotMap);
+      if (nextProduct !== product)
+        hasChanged = true;
+      return nextProduct;
+    });
+    if (!hasChanged)
+      return order;
+    const enrichedOrder = {
+      ...order,
+      products: enrichedProducts
+    };
+    return enrichedOrder;
+  }
   withPendingSyncProductTitles(order, productMap) {
     const products = Array.isArray(order.products) ? order.products : null;
     if (!(products == null ? void 0 : products.length))
@@ -3992,8 +4277,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,
@@ -4002,20 +4293,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
       });
@@ -4036,7 +4324,7 @@ var Server = class {
       });
       return {
         code: 200,
-        data: { list: extensionFilteredProducts, count: extensionFilteredProducts.length },
+        data: this.buildProductQueryResultPayload(extensionFilteredProducts),
         message: "",
         status: true
       };
@@ -4044,9 +4332,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, {
@@ -4076,11 +4362,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, {
@@ -4120,18 +4402,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) {
@@ -4155,11 +4437,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
     }) : [];
@@ -4202,11 +4480,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

@@ -43,6 +43,16 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private logError;
     private logWarning;
+    /**
+     * 在订单进入内存或 SQLite 前统一压缩子项强身份重复并补齐协议 UID。
+     * 仅记录计数与订单标识，不输出商品、预约、支付或客户明细。
+     */
+    private normalizeOrderCollectionsForIngress;
+    /**
+     * incoming 决定权威成员集合；同一持久化行仍从 existing 补齐 incoming 省略的本地展示字段。
+     */
+    private mergeAuthoritativeOrderCollection;
+    private reconcileOverwriteOrderCollections;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -212,10 +222,6 @@ export declare class OrderModule extends BaseModule implements Module {
     private findOrderIndexByIdentity;
     private getOrderCompletenessScore;
     private pickPreferredOrder;
-    private getProductIdentityKeys;
-    private mergeOrderProductLists;
-    private getPaymentMergeKey;
-    private mergeOrderPaymentLists;
     private mergeOrderRecords;
     private summarizeDuplicateOrders;
     private logDuplicateOrders;