@pisell/pisellos 2.3.24 → 2.3.25

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

@@ -18,8 +18,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private productsPriceCache;
     private readonly CACHE_MAX_DAYS;
     private formatters;
-    private isBuiltinFormatterRegistered;
-    private isLegacyPriceFormatterEnabled;
+    private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
     private quotationBridgeLoadedKey?;
@@ -37,8 +36,6 @@ export declare class ProductsModule extends BaseModule implements Module {
     private lastPreloadCompletedAtMs;
     /** IndexDB 写入串行队列，避免快照与 patch 并发交错 */
     private productIndexDBSaveQueue;
-    /** 最近一次智能定价评估提取的 schedule 变价时间点（HH:mm），供 Server 订阅定时刷新使用 */
-    private lastScheduleTimePoints;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     /**
@@ -111,10 +108,6 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     private prepareProductsWithPrice;
     private getProductsPriceCacheKey;
-    /**
-     * 稳定序列化策略上下文，避免对象 key 顺序不同导致缓存 key 抖动。
-     */
-    private stringifyStable;
     private normalizeProductIds;
     /**
      * 按轻量范围返回商品 ID，不做 structuredClone。
@@ -129,26 +122,14 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     private applyFormatters;
     /**
-     * 注册内置商品格式化器。
-     *
-     * 智能定价默认替代报价单逻辑；报价单 formatter 仅在 enableLegacyPriceFormatter=true 时启用。
+     * 注册内置的价格格式化器
+     * 这个格式化器负责将价格数据应用到商品上
      * @private
      */
-    private registerBuiltinProductFormatters;
-    /**
-     * 是否启用旧报价单价格 formatter。
-     *
-     * 默认关闭，避免报价单逻辑覆盖智能定价结果。
-     */
-    private shouldEnableLegacyPriceFormatter;
-    /**
-     * 返回最近一次 prepareProductsWithPrice / DataVariant 评估提取的变价时间点（HH:mm）。
-     * 供 OS Server 商品 query 订阅定时刷新使用。
-     */
-    getLastScheduleTimePoints(): string[];
+    private registerBuiltinPriceFormatter;
     /**
      * 注册商品格式化器
-     * 格式化器会按注册顺序依次执行；legacy 启用时先兜底报价，再由智能定价覆盖。
+     * 格式化器会按注册顺序依次执行（内置价格格式化器始终是第一个）
      * @param formatter 格式化函数
      * @param prepend 是否插入到队列开头（默认 false，追加到末尾）
      * @example
@@ -163,8 +144,8 @@ export declare class ProductsModule extends BaseModule implements Module {
      */
     registerFormatter(formatter: ProductFormatter, prepend?: boolean): void;
     /**
-     * 清空所有格式化器（包括内置智能定价格式化器）
-     * @param keepBuiltin 是否保留内置智能定价格式化器（默认 true）
+     * 清空所有格式化器（包括内置价格格式化器）
+     * @param keepBuiltin 是否保留内置价格格式化器（默认 true）
      */
     clearFormatters(keepBuiltin?: boolean): void;
     /**

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

@@ -43,10 +43,8 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     // 最多缓存7天
     // 商品格式化器列表
     this.formatters = [];
-    // 是否已注册内置商品格式化器
-    this.isBuiltinFormatterRegistered = false;
-    // 旧报价单格式化器默认关闭，仅显式开启时作为兼容兜底注册
-    this.isLegacyPriceFormatterEnabled = false;
+    // 是否已注册内置价格格式化器
+    this.isPriceFormatterRegistered = false;
     this.quotationBridgeLoadedKey = "";
     this.quotationScheduleCache = /* @__PURE__ */ new Map();
     this.quotationScheduleCacheSource = null;
@@ -58,8 +56,6 @@ 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;
@@ -86,7 +82,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         console.warn("[Products] IndexDB Manager 未找到");
       }
     }
-    this.registerBuiltinProductFormatters();
+    this.registerBuiltinPriceFormatter();
     this.initProductDataSource();
     this.setupProductSync();
     this.logInfo("模块初始化完成", {
@@ -478,7 +474,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * @private
    */
   async prepareProductsWithPrice(schedule_date, extraContext, options) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     const tTotal = performance.now();
     const targetIds = options == null ? void 0 : options.productIds;
     const isIncremental = Array.isArray(targetIds);
@@ -503,28 +499,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         (0, import_product.perfMark)("prepareProducts.extractIds", performance.now() - tIds, { count: ids.length });
       }
       this.logInfo("获取到商品列表", { productCount: products.length });
-      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 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 });
       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();
@@ -564,21 +553,7 @@ 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(",")}` : "";
-    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);
+    return `${datetime}:customer:${(extraContext == null ? void 0 : extraContext.customer_id) ?? ""}${productScope}`;
   }
   normalizeProductIds(productIds) {
     if (!Array.isArray(productIds))
@@ -662,50 +637,21 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     return result;
   }
   /**
-   * 注册内置商品格式化器。
-   *
-   * 智能定价默认替代报价单逻辑；报价单 formatter 仅在 enableLegacyPriceFormatter=true 时启用。
+   * 注册内置的价格格式化器
+   * 这个格式化器负责将价格数据应用到商品上
    * @private
    */
-  registerBuiltinProductFormatters() {
-    if (this.isBuiltinFormatterRegistered) {
-      console.warn("[ProductsModule] 内置商品格式化器已注册，跳过");
+  registerBuiltinPriceFormatter() {
+    if (this.isPriceFormatterRegistered) {
+      console.warn("[ProductsModule] 内置价格格式化器已注册，跳过");
       return;
     }
-    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) => {
+    const priceFormatter = (products, context) => {
       if (!context.priceData || context.priceData.length === 0) {
-        console.log("[ProductsModule] 💰 没有价格数据，跳过 legacy 报价单价格应用");
+        console.log("[ProductsModule] 💰 没有价格数据，跳过价格应用");
         return products;
       }
-      console.log(`[ProductsModule] 💰 应用 legacy 报价单价格到 ${products.length} 个商品`);
+      console.log(`[ProductsModule] 💰 应用价格数据到 ${products.length} 个商品`);
       return (0, import_product.applyPriceDataToProducts)(products, context.priceData);
     };
     const i18nFormatter = (products, context) => {
@@ -714,34 +660,15 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     const detailValueFormatter = (products, context) => {
       return (0, import_product.applyDetailValueToProducts)(products, context);
     };
-    if (this.isLegacyPriceFormatterEnabled) {
-      this.formatters.push(legacyPriceFormatter);
-    }
-    this.formatters.push(dataVariantFormatter);
+    this.formatters.unshift(priceFormatter);
     this.formatters.push(i18nFormatter);
     this.formatters.push(detailValueFormatter);
-    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];
+    this.isPriceFormatterRegistered = true;
+    console.log("[ProductsModule] ✅ 内置价格格式化器已注册（第 1 个）");
   }
   /**
    * 注册商品格式化器
-   * 格式化器会按注册顺序依次执行；legacy 启用时先兜底报价，再由智能定价覆盖。
+   * 格式化器会按注册顺序依次执行（内置价格格式化器始终是第一个）
    * @param formatter 格式化函数
    * @param prepend 是否插入到队列开头（默认 false，追加到末尾）
    * @example
@@ -756,7 +683,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    */
   registerFormatter(formatter, prepend = false) {
     if (prepend) {
-      const insertIndex = this.isBuiltinFormatterRegistered ? this.isLegacyPriceFormatterEnabled ? 2 : 1 : 0;
+      const insertIndex = this.isPriceFormatterRegistered ? 1 : 0;
       this.formatters.splice(insertIndex, 0, formatter);
       console.log(`[ProductsModule] 📌 已在位置 ${insertIndex + 1} 插入格式化器，当前共 ${this.formatters.length} 个`);
     } else {
@@ -765,17 +692,16 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
     }
   }
   /**
-   * 清空所有格式化器（包括内置智能定价格式化器）
-   * @param keepBuiltin 是否保留内置智能定价格式化器（默认 true）
+   * 清空所有格式化器（包括内置价格格式化器）
+   * @param keepBuiltin 是否保留内置价格格式化器（默认 true）
    */
   clearFormatters(keepBuiltin = true) {
-    if (keepBuiltin && this.isBuiltinFormatterRegistered) {
-      const builtinCount = this.isLegacyPriceFormatterEnabled ? 2 : 1;
-      this.formatters = this.formatters.slice(0, builtinCount);
-      console.log("[ProductsModule] 🧹 已清空自定义格式化器，保留内置智能定价格式化器");
+    if (keepBuiltin && this.isPriceFormatterRegistered) {
+      this.formatters = [this.formatters[0]];
+      console.log("[ProductsModule] 🧹 已清空自定义格式化器，保留内置价格格式化器");
     } else {
       this.formatters = [];
-      this.isBuiltinFormatterRegistered = false;
+      this.isPriceFormatterRegistered = false;
       console.log("[ProductsModule] 🧹 已清空所有格式化器");
     }
   }
@@ -876,8 +802,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
             "resourceRelation",
             "bundleGroup.bundleItem",
             "optionGroup.optionItem",
-            "variantGroup.variantItem",
-            "dataVariants"
+            "variantGroup.variantItem"
           ],
           open_deposit: 1,
           is_append_product_description: 1,
@@ -1322,7 +1247,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
    * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
    */
   async processProductSyncMessages() {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const messages = [...this.pendingSyncMessages];
     this.pendingSyncMessages = [];
     if (messages.length === 0)
@@ -1376,10 +1301,6 @@ 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,8 +114,6 @@ 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 */
@@ -130,18 +128,6 @@ 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

@@ -187,9 +187,7 @@ 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[];

package/lib/solution/BaseSales/index.js

@@ -1157,8 +1157,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (hasManualDiscountSelection && currentDiscountList.length) {
       return {
         productList: tempOrder.products || [],
-        discountList: currentDiscountList,
-        availableWalletIds: this.getAvailableWalletIds()
+        discountList: currentDiscountList
       };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(
@@ -1187,8 +1186,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
       return {
         productList: tempOrder.products || [],
-        discountList: nextDiscountList,
-        availableWalletIds: this.getAvailableWalletIds()
+        discountList: nextDiscountList
       };
     }
     if (rulesModule) {
@@ -1249,16 +1247,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     return {
       productList: tempOrder.products || [],
-      discountList: nextDiscountList,
-      availableWalletIds: this.getAvailableWalletIds()
+      discountList: nextDiscountList
     };
   }
-  getAvailableWalletIds() {
-    var _a;
-    if (!((_a = this.store.order) == null ? void 0 : _a.getAvailableWalletIds))
-      return [];
-    return this.store.order.getAvailableWalletIds();
-  }
   async bestDiscount(cb) {
     var _a, _b, _c;
     if (!this.store.order)
@@ -1310,6 +1301,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     }
     await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
+    await this.effectsEmit("onDiscountApplied", {
+      productList: tempOrder.products || [],
+      discountList: nextDiscountList,
+      selectedDiscountList: tempOrder.discount_list || [],
+      tempOrder
+    });
     cb == null ? void 0 : cb(result);
     return result;
   }
@@ -1350,6 +1347,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (raw.isAvailable) {
         await this.store.order.recalculateSummary({ createIfMissing: true });
         this.store.order.persistTempOrder();
+        const tempOrder = this.store.order.ensureTempOrder();
+        await this.effectsEmit("onDiscountApplied", {
+          productList: tempOrder.products || [],
+          discountList: this.store.order.getDiscountList(),
+          selectedDiscountList: tempOrder.discount_list || [],
+          tempOrder
+        });
       }
       return {
         isAvailable: raw.isAvailable,
@@ -1508,6 +1512,12 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: result.discountList || [],
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
     } catch (error) {
       throw error;
     }

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.js

@@ -350,6 +350,13 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     if (raw.isAvailable) {
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
+      const tempOrder = this.store.order.ensureTempOrder();
+      await this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: this.store.order.getDiscountList(),
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
     }
     return {
       isAvailable: raw.isAvailable,
@@ -870,7 +877,17 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     void ((_a = discountModule == null ? void 0 : discountModule.setOriginalDiscountList) == null ? void 0 : _a.call(discountModule, []));
     void ((_b = discountModule == null ? void 0 : discountModule.setDiscountList) == null ? void 0 : _b.call(discountModule, []));
     this.store.order.applyDiscount();
-    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => this.store.order.persistTempOrder()).catch((error) => {
+    void this.store.order.recalculateSummary({ createIfMissing: true }).then(() => {
+      var _a2;
+      const tempOrder = this.store.order.ensureTempOrder();
+      this.store.order.persistTempOrder();
+      return this.effectsEmit("onDiscountApplied", {
+        productList: tempOrder.products || [],
+        discountList: ((_a2 = discountModule == null ? void 0 : discountModule.getDiscountList) == null ? void 0 : _a2.call(discountModule)) || [],
+        selectedDiscountList: tempOrder.discount_list || [],
+        tempOrder
+      });
+    }).catch((error) => {
       console.error("Failed to recalculate summary after clearing customer:", error);
     });
     this.core.effects.emit(`${this.name}:onOrderCustomerChange`, null);

package/lib/solution/BookingTicket/types.d.ts

@@ -83,8 +83,6 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
-    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
-    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

package/lib/solution/ShopDiscount/index.js

@@ -505,7 +505,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     try {
       const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      const prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -514,7 +514,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...orderId ? { order_id: orderId } : {}
       }));
-      const goodPassList = (prepareConfigResult == null ? void 0 : prepareConfigResult.discountList) || [];
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.3.24",
+  "version": "2.3.25",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/model/strategy/adapter/dataVariant/adapter.d.ts

@@ -1,50 +0,0 @@
-import type { EvaluationResult, RuntimeContext } from '../../type';
-import type { BusinessAdapter } from '../type';
-import type { DataVariantBusinessData, DataVariantProduct } from './type';
-/**
- * Data Variant 适配器。
- *
- * 负责把智能定价运行态数据转换为 StrategyEngine 能识别的 attributes。
- */
-export declare class DataVariantAdapter implements BusinessAdapter {
-    name: string;
-    version: string;
-    /**
-     * 准备批量全局上下文。
-     *
-     * 这里只放不依赖单个商品的字段，用于预计算 schedule/channel/orderType 等条件。
-     */
-    prepareContext(businessData: DataVariantBusinessData): RuntimeContext;
-    /**
-     * 准备全局预计算上下文。
-     */
-    prepareGlobalContext(businessData: DataVariantBusinessData): RuntimeContext;
-    /**
-     * 准备单商品上下文。
-     *
-     * 商品级条件只在当前商品 data_variants 引用到对应规则后才评估。
-     */
-    prepareProductContext(businessData: DataVariantBusinessData, product: DataVariantProduct): RuntimeContext;
-    transformResult(result: EvaluationResult): EvaluationResult;
-    formatConfig(result: EvaluationResult, businessData?: DataVariantBusinessData): {
-        result: EvaluationResult;
-        businessData?: DataVariantBusinessData;
-    };
-    /**
-     * 构建 menu_match 使用的轻量商品对象。
-     *
-     * collection_ids 来自商品 collection 字段，避免 operator 读取复杂商品对象。
-     */
-    buildProductValue(product: DataVariantProduct): {
-        id: number;
-        product_variant_id: number;
-        collection_ids: number[];
-    };
-    private toNumber;
-    /**
-     * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
-     */
-    private normalizeCustomerId;
-    private normalizeNumberArray;
-}
-export default DataVariantAdapter;