@pisell/pisellos 0.0.556 → 0.0.558

package/lib/solution/VenueBooking/index.js

@@ -50,6 +50,7 @@ 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");
@@ -112,6 +113,10 @@ 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 {
@@ -337,6 +342,8 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     this.customerLoginRefreshIdInFlight = params.customerId;
     const refreshTask = (async () => {
       var _a;
+      this.clearSlotPriceMapCache();
+      this.recalculateOrderPricesFromSmartPricing();
       if (this.store.holder) {
         await this.store.holder.refreshAllFormRecords({
           customer_id: params.customerId,
@@ -348,7 +355,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           channel: (_a = this.otherParams) == null ? void 0 : _a.channel
         });
       }
-      this.recalculateOrderPricesFromQuotation();
       await this.store.order.loadDiscountConfig({
         customerId: params.customerId
       });
@@ -370,7 +376,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async initialize(core, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     this.logMethodStart("initialize");
     this.core = core;
     this.initializeOptions = options || {};
@@ -528,10 +534,6 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       await this.loadRuntimeConfigs();
       if (this.store.schedule) {
         await this.store.schedule.loadAllSchedule();
-        this.injectScheduleResolverToQuotation();
-        (_o = this.store.quotation) == null ? void 0 : _o.loadQuotations({
-          channel: (_n = this.otherParams) == null ? void 0 : _n.channel
-        });
       }
       await this.refreshItemRuleQuantityLimits();
       this.store.status = "ready";
@@ -607,6 +609,81 @@ 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;
+    }
+  }
+  /** 读取 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(),
+      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.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)
@@ -635,9 +712,17 @@ 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")
+        schedule_datetime: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
+        with_extra: ["dataVariants"]
       });
-      const list = Array.isArray(allProducts) ? allProducts : [];
+      let list = Array.isArray(allProducts) ? allProducts : [];
+      list = (0, import_smartPricing.formatProductsWithDataVariant)(
+        list,
+        this.buildSmartPricingContext(),
+        (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss")
+      );
+      this.smartPricingProductCatalog = list.slice();
+      this.clearSlotPriceMapCache();
       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;
@@ -822,29 +907,24 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       config: this.baseSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
-      quotationModule: this.store.quotation,
-      resolveConfig: (date) => this.resolveSlotConfigForDate(date)
+      resolveConfig: (date) => this.resolveSlotConfigForDate(date),
+      buildSlotPriceMap: (date, config, productIds) => this.buildSlotPriceMapForDate(date, config, productIds)
     });
   }
   getTimeSlotGrid(date) {
     const resolvedSlotConfig = this.syncOperatingHoursToSlotConfig(date);
-    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 });
-    }
+    const productIds = [
+      ...new Set(
+        [...this.resourceProductMap.values()].flat().map((m) => m.productId)
+      )
+    ];
+    const slotPriceMap = productIds.length ? this.buildSlotPriceMapForDate(date, resolvedSlotConfig, productIds) : void 0;
     return (0, import_timeSlot.buildTimeSlotGrid)({
       date,
       config: resolvedSlotConfig,
       rawResources: this.store.rawResourceData,
       resourceProductMap: this.resourceProductMap,
-      quotationPriceMap
+      slotPriceMap
     });
   }
   // ─── 时间槽订单操作 ───
@@ -1130,8 +1210,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
             booking_uid: bookingUuid,
             price_breakdown: (0, import_slotMerge.buildPriceBreakdown)({
               group,
-              productId: mapping.productId,
-              quotation: this.store.quotation
+              productId: mapping.productId
             })
           },
           _origin: {
@@ -1229,20 +1308,12 @@ 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 [];
@@ -1281,14 +1352,16 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
-  recalculateOrderPricesFromQuotation() {
+  recalculateOrderPricesFromSmartPricing() {
     var _a, _b;
-    if (!this.store.order || !this.store.quotation)
+    if (!this.store.order)
       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);
@@ -1301,34 +1374,49 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           product,
           this.store.slotConfig.slotDurationMinutes
         );
-        const updatedSlots = slots.map((slot) => ({
-          ...slot,
-          productId: mapping.productId,
-          price: this.store.quotation.getPriceForProduct({
+        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,
             productId: mapping.productId,
-            datetime: slot.startTime
-          }) ?? mapping.price
-        }));
+            price: slotPriceMap ? (0, import_smartPricing.getSlotPriceFromMap)({
+              slotPriceMap,
+              productId: mapping.productId,
+              slotStartTime: slot.startTime,
+              fallbackPrice: mapping.price
+            }) : 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,
-            quotation: this.store.quotation
+            productId: mapping.productId
           });
         }
       } else if (product.product_id != null) {
-        const quotationPrice = this.store.quotation.getPriceForProduct({
-          productId: product.product_id,
-          variantId: product.product_variant_id ?? void 0,
-          datetime: now
+        const smartPrice = (0, import_smartPricing.getPriceForProductAtDatetime)({
+          products: catalog,
+          context,
+          productId: Number(product.product_id),
+          datetime: now,
+          fallbackPrice: product.selling_price
         });
-        if (quotationPrice !== null) {
-          product.selling_price = quotationPrice;
-          product.original_price = quotationPrice;
-        }
+        product.selling_price = smartPrice;
+        product.original_price = smartPrice;
       }
     }
   }
@@ -1514,7 +1602,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async addProductToOrder(product) {
-    var _a;
+    var _a, _b;
     this.logMethodStart("addProductToOrder", {
       product_id: product.product_id,
       product_variant_id: product.product_variant_id
@@ -1522,18 +1610,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) && 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")
+      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 (quotationPrice !== null) {
-          product.selling_price = quotationPrice;
-          product.original_price = quotationPrice;
-        } else if (product.selling_price != null) {
-          product.original_price = product.selling_price;
-        }
+        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;
       }
       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,28 +41,23 @@ function buildDateRangeSummary(params) {
     config,
     rawResources,
     resourceProductMap,
-    quotationModule,
-    resolveConfig
+    resolveConfig,
+    buildSlotPriceMap
   } = params;
   const result = [];
-  const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].flat().map((m) => m.productId))] : [];
+  const productIds = buildSlotPriceMap ? [...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;
-    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 slotPriceMap = buildSlotPriceMap && productIds.length ? buildSlotPriceMap(date, effectiveConfig, productIds) : void 0;
     const grid = (0, import_timeSlot.buildTimeSlotGrid)({
       date,
       config: effectiveConfig,
       rawResources,
       resourceProductMap,
-      quotationPriceMap
+      slotPriceMap
     });
     let totalSlots = 0;
     let availableSlots = 0;

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

@@ -5,12 +5,6 @@ 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,17 +82,16 @@ function mergeConsecutiveSlots(slots) {
   return groups;
 }
 function buildPriceBreakdown(params) {
-  const { group, productId, quotation } = params;
+  const { group } = 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 === shelfId && last.end_time === startHm) {
+    if (last && last.unit_price === unitPrice && last.quotation_shelf_id === 0 && last.end_time === startHm) {
       last.end_time = endHm;
       last.quantity += 1;
     } else {
@@ -100,7 +99,7 @@ function buildPriceBreakdown(params) {
         start_time: startHm,
         end_time: endHm,
         unit_price: unitPrice,
-        quotation_shelf_id: shelfId,
+        quotation_shelf_id: 0,
         quantity: 1
       });
     }

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

@@ -0,0 +1,69 @@
+import type { ProductData } from '../../../modules/Product/types';
+import type { ScheduleItem } from '../../../modules/Schedule/types';
+import type { DataVariantBusinessData, DataVariantMenu, DataVariantProduct } from '../../../model/strategy/adapter/dataVariant/type';
+import type { DataVariantEvaluator } from '../../../model/strategy/adapter/dataVariant/evaluator';
+import type { StrategyConfig } from '../../../model/strategy/type';
+import type { VenueBookingSlotConfig } from '../types';
+/** VenueBooking 智能定价运行时上下文 */
+export interface VenueBookingSmartPricingContext {
+    evaluator?: DataVariantEvaluator | null;
+    scheduleList?: ScheduleItem[];
+    menuList?: DataVariantMenu[];
+    customerId?: number | string;
+    channel?: string;
+    businessCode?: string;
+    orderType?: string;
+    strategy_context?: Record<string, any>;
+    strategyConfigs?: StrategyConfig[];
+}
+/** 从商品上读取展示/算价用的 price 字段 */
+export declare function extractProductPrice(product: DataVariantProduct): string | null;
+/** 组装 DataVariant 评估入参，对齐 OS Server buildProductFormatterContext 语义 */
+export declare function buildDataVariantBusinessData(products: ProductData[], context: VenueBookingSmartPricingContext, scheduleDateTime: string): DataVariantBusinessData;
+/**
+ * 对商品列表执行一次智能定价格式化（loadProducts 后使用）。
+ * evaluator 未注入时原样返回并打 warning。
+ */
+export declare function formatProductsWithDataVariant(products: ProductData[], context: VenueBookingSmartPricingContext, scheduleDateTime?: string): ProductData[];
+/**
+ * 根据 schedule_time_points 与营业开始时间，构造当天需要评估的 datetime 列表（升序）。
+ * 跨日营业时，早于营业开始小时的时间点归到次日。
+ */
+export declare function buildEvaluationDatetimes(params: {
+    date: string;
+    config: VenueBookingSlotConfig;
+    scheduleTimePoints: string[];
+}): string[];
+/** 找到 slot 时间所属分段的评估 datetime（max(evalDt <= slotDt)） */
+export declare function findSegmentEvalDatetime(slotDatetime: string, evalDatetimes: string[]): string;
+/** 将 slot 标签转为与 timeSlot 网格一致的 slotStart 字符串 */
+export declare function buildSlotStartDatetime(date: string, label: string, config: VenueBookingSlotConfig): string;
+/**
+ * 按 schedule 分段批量 resolveProducts，输出与 quotation 相同 key 格式的 slot 价格 Map。
+ * key: `${productId}:${slotStart}`，value: price | null
+ */
+export declare function buildSlotPriceMapByScheduleSegments(params: {
+    products: ProductData[];
+    productIds: number[];
+    date: string;
+    timeLabels: string[];
+    config: VenueBookingSlotConfig;
+    context: VenueBookingSmartPricingContext;
+}): Map<string, string | null>;
+/**
+ * 指定商品在某一 datetime 的智能定价（addon / 单点重算用）。
+ */
+export declare function getPriceForProductAtDatetime(params: {
+    products: ProductData[];
+    context: VenueBookingSmartPricingContext;
+    productId: number;
+    datetime: string;
+    fallbackPrice?: string;
+}): string;
+/** 从 slot 价格 Map 读取单价，找不到则回退 fallback */
+export declare function getSlotPriceFromMap(params: {
+    slotPriceMap: Map<string, string | null>;
+    productId: number;
+    slotStartTime: string;
+    fallbackPrice?: string;
+}): string;