@pisell/pisellos 2.3.28 → 2.3.29

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

@@ -43,8 +43,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     // 最多缓存7天
     // 商品格式化器列表
     this.formatters = [];
-    // 是否已注册内置价格格式化器
-    this.isPriceFormatterRegistered = false;
+    // 是否已注册内置商品格式化器
+    this.isBuiltinFormatterRegistered = false;
+    // 旧报价单格式化器默认关闭，仅显式开启时作为兼容兜底注册
+    this.isLegacyPriceFormatterEnabled = false;
     this.quotationBridgeLoadedKey = "";
     this.quotationScheduleCache = /* @__PURE__ */ new Map();
     this.quotationScheduleCacheSource = null;
@@ -56,6 +58,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     this.lastPreloadCompletedAtMs = 0;
     /** IndexDB 写入串行队列，避免快照与 patch 并发交错 */
     this.productIndexDBSaveQueue = Promise.resolve();
+    /** 最近一次智能定价评估提取的 schedule 变价时间点（HH:mm），供 Server 订阅定时刷新使用 */
+    this.lastScheduleTimePoints = [];
   }
   async initialize(core, options) {
     var _a;
@@ -82,7 +86,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         console.warn("[Products] IndexDB Manager 未找到");
       }
     }
-    this.registerBuiltinPriceFormatter();
+    this.registerBuiltinProductFormatters();
     this.initProductDataSource();
     this.setupProductSync();
     this.logInfo("模块初始化完成", {
@@ -474,7 +478,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * @private
    */
   async prepareProductsWithPrice(schedule_date, extraContext, options) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const tTotal = performance.now();
     const targetIds = options == null ? void 0 : options.productIds;
     const isIncremental = Array.isArray(targetIds);
@@ -499,21 +503,28 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         (0, import_product.perfMark)("prepareProducts.extractIds", performance.now() - tIds, { count: ids.length });
       }
       this.logInfo("获取到商品列表", { productCount: products.length });
-      const tPrice = performance.now();
-      const priceData = await this.loadProductsPrice({
-        ids,
-        schedule_date,
-        schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
-        customer_id: extraContext == null ? void 0 : extraContext.customer_id
-      });
-      (0, import_product.perfMark)("prepareProducts.loadPrice", performance.now() - tPrice, { count: ids.length });
-      this.logInfo("获取商品报价单价格成功", { priceDataCount: (priceData == null ? void 0 : priceData.length) ?? 0 });
+      let priceData = [];
+      if (this.isLegacyPriceFormatterEnabled) {
+        const tPrice = performance.now();
+        priceData = await this.loadProductsPrice({
+          ids,
+          schedule_date,
+          schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
+          customer_id: extraContext == null ? void 0 : extraContext.customer_id
+        });
+        (0, import_product.perfMark)("prepareProducts.loadPrice", performance.now() - tPrice, { count: ids.length });
+        this.logInfo("获取商品报价单价格成功", { priceDataCount: (priceData == null ? void 0 : priceData.length) ?? 0 });
+      }
       const context = {
         schedule_date,
         schedule_datetime: extraContext == null ? void 0 : extraContext.schedule_datetime,
         customer_id: extraContext == null ? void 0 : extraContext.customer_id,
         priceData,
         locale: (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.locale,
+        dataVariantEvaluator: (extraContext == null ? void 0 : extraContext.dataVariantEvaluator) || ((_d = (_c = this.core) == null ? void 0 : _c.context) == null ? void 0 : _d.dataVariantEvaluator),
+        menuList: (extraContext == null ? void 0 : extraContext.menuList) || [],
+        scheduleList: (extraContext == null ? void 0 : extraContext.scheduleList) || [],
+        strategy_context: extraContext == null ? void 0 : extraContext.strategy_context,
         ...extraContext
       };
       const tFormat = performance.now();
@@ -553,7 +564,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
   getProductsPriceCacheKey(schedule_date, extraContext, productIds) {
     const datetime = (extraContext == null ? void 0 : extraContext.schedule_datetime) || schedule_date;
     const productScope = productIds ? `:products:${productIds.join(",")}` : "";
-    return `${datetime}:customer:${(extraContext == null ? void 0 : extraContext.customer_id) ?? ""}${productScope}`;
+    const strategyScope = this.stringifyStable((extraContext == null ? void 0 : extraContext.strategy_context) || {});
+    return `${datetime}:customer:${(extraContext == null ? void 0 : extraContext.customer_id) ?? ""}:strategy:${strategyScope}${productScope}`;
+  }
+  /**
+   * 稳定序列化策略上下文，避免对象 key 顺序不同导致缓存 key 抖动。
+   */
+  stringifyStable(value) {
+    if (value == null)
+      return "";
+    if (Array.isArray(value))
+      return `[${value.map((item) => this.stringifyStable(item)).join(",")}]`;
+    if (typeof value === "object") {
+      return `{${Object.keys(value).sort().map((key) => `${key}:${this.stringifyStable(value[key])}`).join(",")}}`;
+    }
+    return String(value);
   }
   normalizeProductIds(productIds) {
     if (!Array.isArray(productIds))
@@ -637,21 +662,50 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     return result;
   }
   /**
-   * 注册内置的价格格式化器
-   * 这个格式化器负责将价格数据应用到商品上
+   * 注册内置商品格式化器。
+   *
+   * 智能定价默认替代报价单逻辑；报价单 formatter 仅在 enableLegacyPriceFormatter=true 时启用。
    * @private
    */
-  registerBuiltinPriceFormatter() {
-    if (this.isPriceFormatterRegistered) {
-      console.warn("[ProductsModule] 内置价格格式化器已注册，跳过");
+  registerBuiltinProductFormatters() {
+    if (this.isBuiltinFormatterRegistered) {
+      console.warn("[ProductsModule] 内置商品格式化器已注册，跳过");
       return;
     }
-    const priceFormatter = (products, context) => {
+    this.isLegacyPriceFormatterEnabled = this.shouldEnableLegacyPriceFormatter();
+    const dataVariantFormatter = (products, context) => {
+      var _a, _b;
+      const evaluator = context.dataVariantEvaluator || ((_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator);
+      if (!evaluator || typeof evaluator.resolveProducts !== "function") {
+        this.lastScheduleTimePoints = [];
+        this.logWarning("智能定价评估器未注入，跳过 DataVariant 格式化", {
+          productCount: products.length
+        });
+        return products;
+      }
+      const strategyContext = context.strategy_context || {};
+      const businessData = {
+        products,
+        scheduleDateTime: context.schedule_datetime || context.schedule_date,
+        scheduleList: context.scheduleList || [],
+        menuList: context.menuList || [],
+        customerId: context.customer_id,
+        channel: strategyContext.channel,
+        orderType: strategyContext.orderType || strategyContext.order_type,
+        businessCode: strategyContext.business_code ?? strategyContext.businessCode,
+        availableWalletIds: strategyContext.available_wallet_ids,
+        custom: strategyContext
+      };
+      const result = evaluator.resolveProducts(businessData);
+      this.lastScheduleTimePoints = Array.isArray(result == null ? void 0 : result.scheduleTimePoints) ? [...result.scheduleTimePoints] : [];
+      return Array.isArray(result == null ? void 0 : result.products) ? result.products : products;
+    };
+    const legacyPriceFormatter = (products, context) => {
       if (!context.priceData || context.priceData.length === 0) {
-        console.log("[ProductsModule] 💰 没有价格数据，跳过价格应用");
+        console.log("[ProductsModule] 💰 没有价格数据，跳过 legacy 报价单价格应用");
         return products;
       }
-      console.log(`[ProductsModule] 💰 应用价格数据到 ${products.length} 个商品`);
+      console.log(`[ProductsModule] 💰 应用 legacy 报价单价格到 ${products.length} 个商品`);
       return (0, import_product.applyPriceDataToProducts)(products, context.priceData);
     };
     const i18nFormatter = (products, context) => {
@@ -660,15 +714,34 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     const detailValueFormatter = (products, context) => {
       return (0, import_product.applyDetailValueToProducts)(products, context);
     };
-    this.formatters.unshift(priceFormatter);
+    if (this.isLegacyPriceFormatterEnabled) {
+      this.formatters.push(legacyPriceFormatter);
+    }
+    this.formatters.push(dataVariantFormatter);
     this.formatters.push(i18nFormatter);
     this.formatters.push(detailValueFormatter);
-    this.isPriceFormatterRegistered = true;
-    console.log("[ProductsModule] ✅ 内置价格格式化器已注册（第 1 个）");
+    this.isBuiltinFormatterRegistered = true;
+    console.log("[ProductsModule] ✅ 内置商品格式化器已注册（智能定价优先）");
+  }
+  /**
+   * 是否启用旧报价单价格 formatter。
+   *
+   * 默认关闭，避免报价单逻辑覆盖智能定价结果。
+   */
+  shouldEnableLegacyPriceFormatter() {
+    var _a, _b, _c;
+    return ((_a = this.otherParams) == null ? void 0 : _a.enableLegacyPriceFormatter) === true || ((_c = (_b = this.core) == null ? void 0 : _b.context) == null ? void 0 : _c.enableLegacyPriceFormatter) === true;
+  }
+  /**
+   * 返回最近一次 prepareProductsWithPrice / DataVariant 评估提取的变价时间点（HH:mm）。
+   * 供 OS Server 商品 query 订阅定时刷新使用。
+   */
+  getLastScheduleTimePoints() {
+    return [...this.lastScheduleTimePoints];
   }
   /**
    * 注册商品格式化器
-   * 格式化器会按注册顺序依次执行（内置价格格式化器始终是第一个）
+   * 格式化器会按注册顺序依次执行；legacy 启用时先兜底报价，再由智能定价覆盖。
    * @param formatter 格式化函数
    * @param prepend 是否插入到队列开头（默认 false，追加到末尾）
    * @example
@@ -683,7 +756,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   registerFormatter(formatter, prepend = false) {
     if (prepend) {
-      const insertIndex = this.isPriceFormatterRegistered ? 1 : 0;
+      const insertIndex = this.isBuiltinFormatterRegistered ? this.isLegacyPriceFormatterEnabled ? 2 : 1 : 0;
       this.formatters.splice(insertIndex, 0, formatter);
       console.log(`[ProductsModule] 📌 已在位置 ${insertIndex + 1} 插入格式化器，当前共 ${this.formatters.length} 个`);
     } else {
@@ -692,16 +765,17 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
   }
   /**
-   * 清空所有格式化器（包括内置价格格式化器）
-   * @param keepBuiltin 是否保留内置价格格式化器（默认 true）
+   * 清空所有格式化器（包括内置智能定价格式化器）
+   * @param keepBuiltin 是否保留内置智能定价格式化器（默认 true）
    */
   clearFormatters(keepBuiltin = true) {
-    if (keepBuiltin && this.isPriceFormatterRegistered) {
-      this.formatters = [this.formatters[0]];
-      console.log("[ProductsModule] 🧹 已清空自定义格式化器，保留内置价格格式化器");
+    if (keepBuiltin && this.isBuiltinFormatterRegistered) {
+      const builtinCount = this.isLegacyPriceFormatterEnabled ? 2 : 1;
+      this.formatters = this.formatters.slice(0, builtinCount);
+      console.log("[ProductsModule] 🧹 已清空自定义格式化器，保留内置智能定价格式化器");
     } else {
       this.formatters = [];
-      this.isPriceFormatterRegistered = false;
+      this.isBuiltinFormatterRegistered = false;
       console.log("[ProductsModule] 🧹 已清空所有格式化器");
     }
   }
@@ -802,7 +876,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
             "resourceRelation",
             "bundleGroup.bundleItem",
             "optionGroup.optionItem",
-            "variantGroup.variantItem"
+            "variantGroup.variantItem",
+            "dataVariants"
           ],
           open_deposit: 1,
           is_append_product_description: 1,
@@ -1247,7 +1322,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
    */
   async processProductSyncMessages() {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const messages = [...this.pendingSyncMessages];
     this.pendingSyncMessages = [];
     if (messages.length === 0)
@@ -1301,6 +1376,10 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         if ((_f = msg.relation_product_ids) == null ? void 0 : _f.length) {
           sseRefreshIds.push(...msg.relation_product_ids);
         }
+      } else if (["product_data_variant"].includes(channelKey)) {
+        if ((_g = msg.product_ids) == null ? void 0 : _g.length) {
+          sseRefreshIds.push(...msg.product_ids);
+        }
       }
     }
     const uniqueDeleteIds = [...new Set(deleteIds)];

package/lib/server/modules/products/types.d.ts

@@ -114,6 +114,8 @@ export interface ProductSyncMessage {
     change_types?: string[];
     /** 关联商品 ID（product_collection / product_category / product_quotation 变更时携带） */
     relation_product_ids?: number[];
+    /** 关联商品 ID（product_data_variant 变更时携带） */
+    product_ids?: number[];
     message_uuid?: string;
     timestamp?: string;
     /** 内部标记：来源频道 key */
@@ -128,6 +130,18 @@ export interface ProductFormatterContext {
     customer_id?: number | string;
     priceData?: LoadProductsPriceData[];
     scheduleModule?: any;
+    /** 全量餐牌列表，供智能定价 menu_match 等条件判断使用 */
+    menuList?: any[];
+    /** 全量日程列表，供智能定价 schedule_match 等条件判断使用 */
+    scheduleList?: any[];
+    /** 外部传入的策略上下文，仅承载定价条件，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
+    /** 智能定价评估器，由宿主统一注入到 PisellOS context */
+    dataVariantEvaluator?: {
+        resolveProducts: (businessData: any) => {
+            products: ProductData[];
+        };
+    };
     locale?: string;
 }
 /**

package/lib/solution/BaseSales/index.d.ts

@@ -49,9 +49,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private queuedAutoPaymentSync;
     private autoPaymentSyncFlushing;
     private autoPaymentSyncTimer;
-    private salesDetailLoadInFlight;
+    private salesDetailLoadInFlightCount;
+    private salesDetailLoadSequence;
+    private salesDetailHydrateQueue;
     private serverOrderChangeUnsubscribe;
     private serverOrderChangeHydrateInFlight;
+    private queuedServerOrderChanges;
     private serverOrderChangeSyncEnabled;
     constructor(name?: string, version?: string);
     /**
@@ -75,8 +78,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private logError;
     private isCurrentSalesOrderRecord;
     setServerOrderChangeSyncEnabled(enabled: boolean): void;
+    private queueLatestServerOrderChange;
+    private drainQueuedServerOrderChanges;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
+    private hydrateLatestLoadedSalesDetail;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;
@@ -187,7 +193,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     }): Promise<{
         productList: Record<string, any>[];
         discountList: Discount[];
+        availableWalletIds: number[];
     }>;
+    getAvailableWalletIds(): number[];
     bestDiscount(cb?: (result: any) => void): Promise<{
         productList: Record<string, any>[];
         discountList: Discount[];