@pisell/pisellos 2.1.163 → 2.1.165

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

@@ -3,7 +3,6 @@ import { BaseModule } from '../../modules/BaseModule';
 import { VenueBookingAddLogParams, VenueBookingSlotConfig, VenueDateSummaryItem, VenueSlotSelection, VenueTimeSlotGrid } from './types';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity } from '../ScanOrder/types';
 import type { UpdateProductInOrderParams } from '../../modules/Order/types';
-import type { ScheduleItem } from '../../modules/Schedule/types';
 import type { OpenDataAvailabilityResult } from '../../modules/OpenData';
 import type { ProductData } from '../../modules/Product/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -41,10 +40,6 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private productsLoaded;
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
-    /** 按日期缓存 slot 智能定价 Map，避免同周重复 resolveProducts */
-    private slotPriceMapCache;
-    /** loadProducts 后缓存的全量商品（venue + addon），供分段算价复用 */
-    private smartPricingProductCatalog;
     private getLoggerContext;
     private safeStringify;
     private pickErrorMessage;
@@ -73,22 +68,6 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
-    /** 清除 slot 价格分段缓存（商品重载 / 登录后 customerId 变化时调用） */
-    private clearSlotPriceMapCache;
-    /** 读取当前登录 customerId */
-    private resolveCustomerIdForSmartPricing;
-    private resolveAvailableWalletIdsForSmartPricing;
-    /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
-    private getScheduleListForSmartPricing;
-    /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */
-    private buildSmartPricingContext;
-    /** venue + addon 全量商品，供智能定价评估 */
-    private getAllProductsForSmartPricing;
-    private getSlotPriceMapCacheKey;
-    /**
-     * 按 schedule 分段构建 slot 价格 Map，带实例级缓存。
-     */
-    private buildSlotPriceMapForDate;
     loadAllProducts(): Promise<{
         venueProducts: ProductData[];
         addonProducts: ProductData[];
@@ -161,7 +140,8 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     setSlotConfig(config: Partial<VenueBookingSlotConfig>): void;
     getSlotConfig(): VenueBookingSlotConfig;
     loadSchedules(): Promise<void>;
-    getScheduleListByIds(ids: number[]): ScheduleItem[];
+    private injectScheduleResolverToQuotation;
+    getScheduleListByIds(ids: number[]): import("../../modules/Schedule/types").ScheduleItem[];
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
@@ -169,7 +149,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromSmartPricing;
+    private recalculateOrderPricesFromQuotation;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: import("../../modules/Discount").Discount[];
@@ -188,6 +168,11 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     submitOrder<T = any>(): Promise<T>;
+    /**
+     * 0 元订单免费领取（非定金场景）
+     * 与 appointment getFreeProduct 同接口：POST /pay/order/free-pay/:id
+     */
+    submitFreeOrder(id: string | number): Promise<any>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/lib/solution/VenueBooking/index.js

@@ -50,7 +50,6 @@ var import_resource = require("./utils/resource");
 var import_timeSlot = require("./utils/timeSlot");
 var import_dateSummary = require("./utils/dateSummary");
 var import_slotMerge = require("./utils/slotMerge");
-var import_smartPricing = require("./utils/smartPricing");
 var import_utils3 = require("../../modules/Order/utils");
 var import_Order = require("../../modules/Order");
 var import_types4 = require("../RegisterAndLogin/types");
@@ -111,10 +110,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.loadAllProductsInFlight = null;
     this.productsLoaded = false;
     this.loadOpenDataConfigInFlight = null;
-    /** 按日期缓存 slot 智能定价 Map，避免同周重复 resolveProducts */
-    this.slotPriceMapCache = /* @__PURE__ */ new Map();
-    /** loadProducts 后缓存的全量商品（venue + addon），供分段算价复用 */
-    this.smartPricingProductCatalog = [];
   }
   getLoggerContext() {
     return {
@@ -303,11 +298,16 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
     this.customerLoginRefreshIdInFlight = params.customerId;
     const refreshTask = (async () => {
+      var _a;
+      if (this.store.quotation) {
+        await this.store.quotation.loadQuotations({
+          channel: (_a = this.otherParams) == null ? void 0 : _a.channel
+        });
+      }
+      this.recalculateOrderPricesFromQuotation();
       await this.store.order.loadDiscountConfig({
         customerId: params.customerId
       });
-      this.clearSlotPriceMapCache();
-      this.recalculateOrderPricesFromSmartPricing();
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
       await this.refreshItemRuleQuantityLimits();
@@ -326,7 +326,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async initialize(core, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     this.logMethodStart("initialize");
     this.core = core;
     this.initializeOptions = options || {};
@@ -462,6 +462,10 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       await this.loadRuntimeConfigs();
       if (this.store.schedule) {
         await this.store.schedule.loadAllSchedule();
+        this.injectScheduleResolverToQuotation();
+        (_k = this.store.quotation) == null ? void 0 : _k.loadQuotations({
+          channel: (_j = this.otherParams) == null ? void 0 : _j.channel
+        });
       }
       await this.refreshItemRuleQuantityLimits();
       this.store.status = "ready";
@@ -537,93 +541,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
   getCartValidation() {
     return this.store.cartValidation || { passed: null, failures: [] };
   }
-  /** 清除 slot 价格分段缓存（商品重载 / 登录后 customerId 变化时调用） */
-  clearSlotPriceMapCache() {
-    this.slotPriceMapCache.clear();
-  }
-  /** 读取当前登录 customerId */
-  resolveCustomerIdForSmartPricing() {
-    var _a, _b, _c;
-    try {
-      const userPlugin = (_a = this.core) == null ? void 0 : _a.getPlugin("user");
-      const customerId = Number((_c = (_b = userPlugin == null ? void 0 : userPlugin.get) == null ? void 0 : _b.call(userPlugin)) == null ? void 0 : _c.id);
-      return Number.isFinite(customerId) && customerId > 0 ? customerId : void 0;
-    } catch {
-      return void 0;
-    }
-  }
-  resolveAvailableWalletIdsForSmartPricing() {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const orderWalletIds = (_b = (_a = this.store.order) == null ? void 0 : _a.getAvailableWalletIds) == null ? void 0 : _b.call(_a);
-    const fallbackWalletIds = ((_c = this.otherParams) == null ? void 0 : _c.available_wallet_ids) || ((_d = this.otherParams) == null ? void 0 : _d.availableWalletIds) || ((_f = (_e = this.otherParams) == null ? void 0 : _e.strategy_context) == null ? void 0 : _f.available_wallet_ids) || ((_h = (_g = this.otherParams) == null ? void 0 : _g.strategy_context) == null ? void 0 : _h.availableWalletIds);
-    const source = Array.isArray(orderWalletIds) && orderWalletIds.length ? orderWalletIds : fallbackWalletIds;
-    if (!Array.isArray(source))
-      return [];
-    const ids = source.map((item) => Number(item)).filter((item) => Number.isFinite(item) && item > 0);
-    return Array.from(new Set(ids));
-  }
-  /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
-  getScheduleListForSmartPricing() {
-    var _a;
-    const scheduleModule = this.store.schedule;
-    const list = (_a = scheduleModule == null ? void 0 : scheduleModule.store) == null ? void 0 : _a.scheduleList;
-    return Array.isArray(list) ? list : [];
-  }
-  /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */
-  buildSmartPricingContext(customerId) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-    const evaluator = (_b = (_a = this.core) == null ? void 0 : _a.context) == null ? void 0 : _b.dataVariantEvaluator;
-    return {
-      evaluator,
-      scheduleList: this.getScheduleListForSmartPricing(),
-      menuList: ((_c = this.otherParams) == null ? void 0 : _c.menuList) || ((_e = (_d = this.otherParams) == null ? void 0 : _d.openData) == null ? void 0 : _e.menuList) || [],
-      customerId: customerId ?? this.resolveCustomerIdForSmartPricing(),
-      availableWalletIds: this.resolveAvailableWalletIdsForSmartPricing(),
-      channel: (_f = this.otherParams) == null ? void 0 : _f.channel,
-      businessCode: (_g = this.otherParams) == null ? void 0 : _g.businessCode,
-      orderType: ((_h = this.otherParams) == null ? void 0 : _h.orderType) || ((_i = this.otherParams) == null ? void 0 : _i.type),
-      strategy_context: (_j = this.otherParams) == null ? void 0 : _j.strategy_context
-    };
-  }
-  /** venue + addon 全量商品，供智能定价评估 */
-  getAllProductsForSmartPricing() {
-    if (this.smartPricingProductCatalog.length) {
-      return this.smartPricingProductCatalog;
-    }
-    const venueList = this.getVenueProducts();
-    const addonList = this.getAddonProductsList();
-    return [...venueList, ...addonList];
-  }
-  getSlotPriceMapCacheKey(date, context) {
-    return [
-      date,
-      context.customerId ?? "",
-      (context.availableWalletIds || []).join(","),
-      context.channel ?? "",
-      context.businessCode ?? ""
-    ].join("|");
-  }
-  /**
-   * 按 schedule 分段构建 slot 价格 Map，带实例级缓存。
-   */
-  buildSlotPriceMapForDate(date, config, productIds) {
-    const context = this.buildSmartPricingContext();
-    const cacheKey = this.getSlotPriceMapCacheKey(date, context);
-    const cached = this.slotPriceMapCache.get(cacheKey);
-    if (cached)
-      return cached;
-    const timeLabels = (0, import_timeSlot.generateTimeLabels)(config);
-    const slotPriceMap = (0, import_smartPricing.buildSlotPriceMapByScheduleSegments)({
-      products: this.getAllProductsForSmartPricing(),
-      productIds,
-      date,
-      timeLabels,
-      config,
-      context
-    });
-    this.slotPriceMapCache.set(cacheKey, slotPriceMap);
-    return slotPriceMap;
-  }
   // ─── 场地商品 & 附加商品 ───
   async loadAllProducts() {
     if (this.loadAllProductsInFlight)
@@ -652,18 +569,9 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
         menu_list_ids: menuListIds,
         cacheId: this.cacheId,
         schedule_date: (0, import_dayjs.default)().format("YYYY-MM-DD"),
-        schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
-        with_extra: ["dataVariants"]
+        schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
       });
-      const rawList = Array.isArray(allProducts) ? allProducts : [];
-      let list = rawList;
-      this.smartPricingProductCatalog = rawList.slice();
-      list = (0, import_smartPricing.formatProductsWithDataVariant)(
-        list,
-        this.buildSmartPricingContext(),
-        (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
-      );
-      this.clearSlotPriceMapCache();
+      const list = Array.isArray(allProducts) ? allProducts : [];
       const venueList = list.filter((p) => p.duration != null);
       const addonList = list.filter((p) => p.duration == null);
       const venueStore = (_c = this.store.venueProducts) == null ? void 0 : _c.store;
@@ -844,24 +752,29 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       config: this.baseSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
-      resolveConfig: (date) => this.resolveSlotConfigForDate(date),
-      buildSlotPriceMap: (date, config, productIds) => this.buildSlotPriceMapForDate(date, config, productIds)
+      quotationModule: this.store.quotation,
+      resolveConfig: (date) => this.resolveSlotConfigForDate(date)
     });
   }
   getTimeSlotGrid(date) {
     const resolvedSlotConfig = this.syncOperatingHoursToSlotConfig(date);
-    const productIds = [
-      ...new Set(
-        [...this.resourceProductMap.values()].flat().map((m) => m.productId)
-      )
-    ];
-    const slotPriceMap = productIds.length ? this.buildSlotPriceMapForDate(date, resolvedSlotConfig, productIds) : void 0;
+    let quotationPriceMap;
+    if (this.store.quotation) {
+      const productIds = [
+        ...new Set(
+          [...this.resourceProductMap.values()].flat().map((m) => m.productId)
+        )
+      ];
+      const timeLabels = (0, import_timeSlot.generateTimeLabels)(resolvedSlotConfig);
+      const timePoints = timeLabels.map((label) => `${date} ${label}`);
+      quotationPriceMap = this.store.quotation.buildProductPriceMap({ productIds, timePoints });
+    }
     return (0, import_timeSlot.buildTimeSlotGrid)({
       date,
       config: resolvedSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
-      slotPriceMap
+      quotationPriceMap
     });
   }
   // ─── 时间槽订单操作 ───
@@ -1146,7 +1059,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
             booking_uid: bookingUuid,
             price_breakdown: (0, import_slotMerge.buildPriceBreakdown)({
               group,
-              productId: mapping.productId
+              productId: mapping.productId,
+              quotation: this.store.quotation
             })
           },
           _origin: {
@@ -1239,12 +1153,20 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       if (!this.store.schedule)
         throw new Error("schedule 模块未初始化");
       await this.store.schedule.loadAllSchedule();
+      this.injectScheduleResolverToQuotation();
       this.logMethodSuccess("loadSchedules");
     } catch (error) {
       this.logMethodError("loadSchedules", error);
       throw error;
     }
   }
+  injectScheduleResolverToQuotation() {
+    if (this.store.quotation && this.store.schedule) {
+      this.store.quotation.setScheduleResolver(
+        (id) => this.store.schedule.getScheduleListByIds([id])[0]
+      );
+    }
+  }
   getScheduleListByIds(ids) {
     if (!this.store.schedule)
       return [];
@@ -1283,16 +1205,14 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  recalculateOrderPricesFromSmartPricing() {
+  recalculateOrderPricesFromQuotation() {
     var _a, _b;
-    if (!this.store.order)
+    if (!this.store.order || !this.store.quotation)
       return;
     const tempOrder = this.store.order.getTempOrder();
     if (!((_a = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _a.length))
       return;
     const now = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
-    const catalog = this.getAllProductsForSmartPricing();
-    const context = this.buildSmartPricingContext();
     for (const product of tempOrder.products) {
       if ((_b = product.metadata) == null ? void 0 : _b.venue_booking) {
         const mappings = this.resourceProductMap.get(product.metadata.resource_id);
@@ -1305,49 +1225,34 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           product,
           this.store.slotConfig.slotDurationMinutes
         );
-        const uniqueDates = [
-          ...new Set(slots.map((slot) => (0, import_dayjs.default)(slot.startTime).format("YYYY-MM-DD")))
-        ];
-        const slotPriceMaps = /* @__PURE__ */ new Map();
-        for (const slotDate of uniqueDates) {
-          slotPriceMaps.set(
-            slotDate,
-            this.buildSlotPriceMapForDate(slotDate, this.store.slotConfig, [mapping.productId])
-          );
-        }
-        const updatedSlots = slots.map((slot) => {
-          const slotDate = (0, import_dayjs.default)(slot.startTime).format("YYYY-MM-DD");
-          const slotPriceMap = slotPriceMaps.get(slotDate);
-          return {
-            ...slot,
+        const updatedSlots = slots.map((slot) => ({
+          ...slot,
+          productId: mapping.productId,
+          price: this.store.quotation.getPriceForProduct({
             productId: mapping.productId,
-            price: slotPriceMap ? (0, import_smartPricing.getSlotPriceFromMap)({
-              slotPriceMap,
-              productId: mapping.productId,
-              slotStartTime: slot.startTime,
-              fallbackPrice: mapping.price
-            }) : mapping.price
-          };
-        });
+            datetime: slot.startTime
+          }) ?? mapping.price
+        }));
         const merged = (0, import_slotMerge.mergeConsecutiveSlots)(updatedSlots);
         if (merged.length === 1) {
           product.selling_price = merged[0].totalPrice;
           product.original_price = merged[0].totalPrice;
           product.metadata.price_breakdown = (0, import_slotMerge.buildPriceBreakdown)({
             group: merged[0],
-            productId: mapping.productId
+            productId: mapping.productId,
+            quotation: this.store.quotation
           });
         }
       } else if (product.product_id != null) {
-        const smartPrice = (0, import_smartPricing.getPriceForProductAtDatetime)({
-          products: catalog,
-          context,
-          productId: Number(product.product_id),
-          datetime: now,
-          fallbackPrice: product.selling_price
+        const quotationPrice = this.store.quotation.getPriceForProduct({
+          productId: product.product_id,
+          variantId: product.product_variant_id ?? void 0,
+          datetime: now
         });
-        product.selling_price = smartPrice;
-        product.original_price = smartPrice;
+        if (quotationPrice !== null) {
+          product.selling_price = quotationPrice;
+          product.original_price = quotationPrice;
+        }
       }
     }
   }
@@ -1532,8 +1437,26 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 0 元订单免费领取（非定金场景）
+   * 与 appointment getFreeProduct 同接口：POST /pay/order/free-pay/:id
+   */
+  async submitFreeOrder(id) {
+    this.logMethodStart("submitFreeOrder", { id });
+    try {
+      if (!id) {
+        throw new Error("订单 ID 不能为空");
+      }
+      const res = await this.request.post(`/pay/order/free-pay/${id}`);
+      this.logMethodSuccess("submitFreeOrder", { id, status: res == null ? void 0 : res.status });
+      return res;
+    } catch (error) {
+      this.logMethodError("submitFreeOrder", error);
+      throw error;
+    }
+  }
   async addProductToOrder(product) {
-    var _a, _b;
+    var _a;
     this.logMethodStart("addProductToOrder", {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id
@@ -1541,18 +1464,18 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
-      if (!((_a = product.metadata) == null ? void 0 : _a.venue_booking) && product.product_id != null) {
-        const smartPrice = (0, import_smartPricing.getPriceForProductAtDatetime)({
-          products: this.getAllProductsForSmartPricing(),
-          context: this.buildSmartPricingContext(),
-          productId: Number(product.product_id),
-          datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
-          fallbackPrice: product.selling_price
+      if (!((_a = product.metadata) == null ? void 0 : _a.venue_booking) && this.store.quotation && product.product_id != null) {
+        const quotationPrice = this.store.quotation.getPriceForProduct({
+          productId: product.product_id,
+          variantId: product.product_variant_id ?? void 0,
+          datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
         });
-        product.selling_price = smartPrice;
-        product.original_price = smartPrice;
-      } else if (product.selling_price != null && !((_b = product.metadata) == null ? void 0 : _b.venue_booking)) {
-        product.original_price = product.selling_price;
+        if (quotationPrice !== null) {
+          product.selling_price = quotationPrice;
+          product.original_price = quotationPrice;
+        } else if (product.selling_price != null) {
+          product.original_price = product.selling_price;
+        }
       }
       const products = await this.store.order.addProductToOrder(product);
       await this.refreshItemRuleQuantityLimits();

package/lib/solution/VenueBooking/utils/dateSummary.d.ts

@@ -1,11 +1,11 @@
 import type { VenueBookingSlotConfig, VenueResourceRawData, VenueDateSummaryItem, ResourceProductMapping } from '../types';
+import type { QuotationModule } from '../../../modules/Quotation';
 export declare function buildDateRangeSummary(params: {
     startDate: string;
     endDate: string;
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
+    quotationModule?: QuotationModule;
     resolveConfig?: (date: string) => VenueBookingSlotConfig;
-    /** 按日期构建 slot 智能定价 Map */
-    buildSlotPriceMap?: (date: string, config: VenueBookingSlotConfig, productIds: number[]) => Map<string, string | null>;
 }): VenueDateSummaryItem[];

package/lib/solution/VenueBooking/utils/dateSummary.js

@@ -41,23 +41,28 @@ function buildDateRangeSummary(params) {
     config,
     rawResources,
     resourceProductMap,
-    resolveConfig,
-    buildSlotPriceMap
+    quotationModule,
+    resolveConfig
   } = params;
   const result = [];
-  const productIds = buildSlotPriceMap ? [...new Set([...resourceProductMap.values()].flat().map((m) => m.productId))] : [];
+  const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].flat().map((m) => m.productId))] : [];
   let cursor = (0, import_dayjs.default)(startDate);
   const end = (0, import_dayjs.default)(endDate);
   while (!cursor.isAfter(end)) {
     const date = cursor.format("YYYY-MM-DD");
     const effectiveConfig = (resolveConfig == null ? void 0 : resolveConfig(date)) || config;
-    const slotPriceMap = buildSlotPriceMap && productIds.length ? buildSlotPriceMap(date, effectiveConfig, productIds) : void 0;
+    let quotationPriceMap;
+    if (quotationModule && productIds.length) {
+      const timeLabels = (0, import_timeSlot.generateTimeLabels)(effectiveConfig);
+      const timePoints = timeLabels.map((label) => `${date} ${label}`);
+      quotationPriceMap = quotationModule.buildProductPriceMap({ productIds, timePoints });
+    }
     const grid = (0, import_timeSlot.buildTimeSlotGrid)({
       date,
       config: effectiveConfig,
       rawResources,
       resourceProductMap,
-      slotPriceMap
+      quotationPriceMap
     });
     let totalSlots = 0;
     let availableSlots = 0;

package/lib/solution/VenueBooking/utils/slotMerge.d.ts

@@ -5,6 +5,12 @@ export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): Merg
 export declare function buildPriceBreakdown(params: {
     group: MergedSlotGroup;
     productId: number;
+    quotation?: {
+        getQuotationShelfId: (p: {
+            productId: number;
+            datetime: string;
+        }) => number;
+    };
 }): PriceBreakdownEntry[];
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -82,16 +82,17 @@ function mergeConsecutiveSlots(slots) {
   return groups;
 }
 function buildPriceBreakdown(params) {
-  const { group } = params;
+  const { group, productId, quotation } = params;
   if (!group.slots.length)
     return [];
   const entries = [];
   for (const slot of group.slots) {
     const unitPrice = Number(slot.price || "0");
+    const shelfId = quotation ? quotation.getQuotationShelfId({ productId, datetime: slot.startTime }) : 0;
     const startHm = (0, import_dayjs.default)(slot.startTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm");
     const endHm = (0, import_dayjs.default)(slot.endTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm");
     const last = entries[entries.length - 1];
-    if (last && last.unit_price === unitPrice && last.quotation_shelf_id === 0 && last.end_time === startHm) {
+    if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
       last.end_time = endHm;
       last.quantity += 1;
     } else {
@@ -99,7 +100,7 @@ function buildPriceBreakdown(params) {
         start_time: startHm,
         end_time: endHm,
         unit_price: unitPrice,
-        quotation_shelf_id: 0,
+        quotation_shelf_id: shelfId,
         quantity: 1
       });
     }

package/lib/solution/VenueBooking/utils/timeSlot.d.ts

@@ -27,8 +27,6 @@ export declare function buildTimeSlotGrid(params: {
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
-    /** @deprecated 使用 slotPriceMap */
     quotationPriceMap?: Map<string, string | null>;
-    slotPriceMap?: Map<string, string | null>;
 }): VenueTimeSlotGrid;
 export {};

package/lib/solution/VenueBooking/utils/timeSlot.js

@@ -168,7 +168,6 @@ function buildProductSlots(params) {
     now,
     crossDay,
     quotationPriceMap,
-    slotPriceMap,
     childRawResources,
     childTimesCache,
     childEventsCache,
@@ -232,12 +231,11 @@ function buildProductSlots(params) {
     }
     const isBookable = status === "available" || status === "partially_occupied";
     const slotStartStr = slotStart.format("YYYY-MM-DD HH:mm");
-    const resolvedPriceMap = slotPriceMap ?? quotationPriceMap;
     slots.push({
       startTime: slotStartStr,
       endTime: slotEnd.format("YYYY-MM-DD HH:mm"),
       status,
-      price: isBookable ? (resolvedPriceMap == null ? void 0 : resolvedPriceMap.get(`${mapping.productId}:${slotStartStr}`)) ?? mapping.price : null,
+      price: isBookable ? (quotationPriceMap == null ? void 0 : quotationPriceMap.get(`${mapping.productId}:${slotStartStr}`)) ?? mapping.price : null,
       resourceId: resource.resourceId,
       resourceFormId: resource.formId,
       capacity: status === "past" || status === "unavailable" ? null : resCapacity,
@@ -248,8 +246,7 @@ function buildProductSlots(params) {
   return slots;
 }
 function buildTimeSlotGrid(params) {
-  const { date, config, rawResources, resourceProductMap, quotationPriceMap, slotPriceMap } = params;
-  const resolvedPriceMap = slotPriceMap ?? quotationPriceMap;
+  const { date, config, rawResources, resourceProductMap, quotationPriceMap } = params;
   const timeLabels = generateTimeLabels(config);
   const now = (0, import_dayjs.default)();
   const crossDay = isBusinessHoursCrossDay(config);
@@ -282,8 +279,7 @@ function buildTimeSlotGrid(params) {
         resCapacity,
         now,
         crossDay,
-        quotationPriceMap: resolvedPriceMap,
-        slotPriceMap: resolvedPriceMap,
+        quotationPriceMap,
         childRawResources,
         childTimesCache,
         childEventsCache,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.163",
+  "version": "2.1.165",
   "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;