@pisell/pisellos 2.2.314 → 2.2.315

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

@@ -7,7 +7,8 @@ export declare enum VenueBookingHooks {
     onDestroy = "venueBooking:onDestroy",
     onRetryInit = "venueBooking:onRetryInit",
     onRefresh = "venueBooking:onRefresh",
-    onCartValidationChanged = "venueBooking:onCartValidationChanged"
+    onCartValidationChanged = "venueBooking:onCartValidationChanged",
+    onSmartPricingUpdated = "venueBooking:onSmartPricingUpdated"
 }
 export type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export interface VenueBookingEntryContext {

package/lib/solution/VenueBooking/types.js

@@ -10,6 +10,7 @@ let VenueBookingHooks = exports.VenueBookingHooks = /*#__PURE__*/function (Venue
   VenueBookingHooks["onRetryInit"] = "venueBooking:onRetryInit";
   VenueBookingHooks["onRefresh"] = "venueBooking:onRefresh";
   VenueBookingHooks["onCartValidationChanged"] = "venueBooking:onCartValidationChanged";
+  VenueBookingHooks["onSmartPricingUpdated"] = "venueBooking:onSmartPricingUpdated";
   return VenueBookingHooks;
 }({}); // ─── 场地预定核心类型 ───
 const DEFAULT_SLOT_CONFIG = exports.DEFAULT_SLOT_CONFIG = {

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

@@ -9,4 +9,5 @@ export declare function buildDateRangeSummary(params: {
     quotationModule?: QuotationModule;
     channel?: string;
     resolveConfig?: (date: string) => VenueBookingSlotConfig;
+    buildSlotPriceMap?: (date: string, config: VenueBookingSlotConfig, productIds: number[]) => Map<string, string | null>;
 }): VenueDateSummaryItem[];

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

@@ -16,17 +16,19 @@ function buildDateRangeSummary(params) {
     resourceProductMap,
     quotationModule,
     channel,
-    resolveConfig
+    resolveConfig,
+    buildSlotPriceMap
   } = params;
   const result = [];
-  const productIds = quotationModule ? [...new Set([...resourceProductMap.values()].flat().map(m => m.productId))] : [];
+  const productIds = buildSlotPriceMap || quotationModule ? [...new Set([...resourceProductMap.values()].flat().map(m => m.productId))] : [];
   let cursor = (0, _dayjs.default)(startDate);
   const end = (0, _dayjs.default)(endDate);
   while (!cursor.isAfter(end)) {
     const date = cursor.format('YYYY-MM-DD');
     const effectiveConfig = resolveConfig?.(date) || config;
     let quotationPriceMap;
-    if (quotationModule && productIds.length) {
+    const slotPriceMap = buildSlotPriceMap?.(date, effectiveConfig, productIds);
+    if (!slotPriceMap && quotationModule && productIds.length) {
       const timeLabels = (0, _timeSlot.generateTimeLabels)(effectiveConfig);
       const timePoints = timeLabels.map(label => `${date} ${label}`);
       quotationPriceMap = quotationModule.buildProductPriceMap({
@@ -40,7 +42,8 @@ function buildDateRangeSummary(params) {
       config: effectiveConfig,
       rawResources,
       resourceProductMap,
-      quotationPriceMap
+      quotationPriceMap,
+      slotPriceMap
     });
     let totalSlots = 0;
     let availableSlots = 0;

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

@@ -0,0 +1,71 @@
+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;
+    availableWalletIds?: Array<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;
+    variantId?: 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;

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

@@ -0,0 +1,224 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildDataVariantBusinessData = buildDataVariantBusinessData;
+exports.buildEvaluationDatetimes = buildEvaluationDatetimes;
+exports.buildSlotPriceMapByScheduleSegments = buildSlotPriceMapByScheduleSegments;
+exports.buildSlotStartDatetime = buildSlotStartDatetime;
+exports.extractProductPrice = extractProductPrice;
+exports.findSegmentEvalDatetime = findSegmentEvalDatetime;
+exports.formatProductsWithDataVariant = formatProductsWithDataVariant;
+exports.getPriceForProductAtDatetime = getPriceForProductAtDatetime;
+exports.getSlotPriceFromMap = getSlotPriceFromMap;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _timeSlot = require("./timeSlot");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/** VenueBooking 智能定价运行时上下文 */
+
+/** 从商品上读取展示/算价用的 price 字段 */
+function extractProductPrice(product) {
+  const price = product?.price ?? product?.selling_price;
+  if (price == null || price === '') return null;
+  return String(price);
+}
+
+/** 组装 DataVariant 评估入参，对齐 OS Server buildProductFormatterContext 语义 */
+function buildDataVariantBusinessData(products, context, scheduleDateTime) {
+  const strategyContext = context.strategy_context || {};
+  return {
+    products: products,
+    strategyConfigs: context.strategyConfigs,
+    scheduleDateTime,
+    scheduleList: context.scheduleList || [],
+    menuList: context.menuList || [],
+    customerId: context.customerId,
+    availableWalletIds: context.availableWalletIds ?? strategyContext.available_wallet_ids ?? strategyContext.availableWalletIds,
+    channel: context.channel ?? strategyContext.channel,
+    orderType: context.orderType ?? strategyContext.orderType ?? strategyContext.order_type,
+    businessCode: context.businessCode ?? strategyContext.business_code ?? strategyContext.businessCode,
+    custom: strategyContext
+  };
+}
+
+/**
+ * 对商品列表执行一次智能定价格式化（loadProducts 后使用）。
+ * evaluator 未注入时原样返回并打 warning。
+ */
+function formatProductsWithDataVariant(products, context, scheduleDateTime) {
+  const evaluator = context.evaluator;
+  if (!evaluator || typeof evaluator.resolveProducts !== 'function') {
+    console.warn('[VenueBooking][smartPricing] dataVariantEvaluator 未注入，跳过智能定价格式化');
+    return products;
+  }
+
+  // 日程包含结束边界，向后偏移一秒评估，避免前一时段的定价规则覆盖当前时段。
+  // 仅调整规则匹配时间，预约时间和分段缓存 key 仍保留原值。
+  const resolvedAt = (0, _dayjs.default)(scheduleDateTime || undefined).add(1, 'second').format('YYYY-MM-DD HH:mm:ss');
+  // 接口的命中 ID 对应商品查询时刻，不能用于另一个预约时段/客户。
+  // 仅处理本次评估副本，保留目录中的原始数据。
+  const pricingProducts = products.map(product => {
+    const metadata = {
+      ...product.metadata
+    };
+    const hasResolvedVariants = Array.isArray(metadata.data_variant_ids);
+    delete metadata.data_variant_ids;
+    return {
+      ...product,
+      price: hasResolvedVariants ? product.base_price ?? product.price : product.price,
+      metadata
+    };
+  });
+  const businessData = buildDataVariantBusinessData(pricingProducts, context, resolvedAt);
+  const result = evaluator.resolveProducts(businessData);
+  return Array.isArray(result?.products) ? result.products : products;
+}
+
+/**
+ * 根据 schedule_time_points 与营业开始时间，构造当天需要评估的 datetime 列表（升序）。
+ * 跨日营业时，早于营业开始小时的时间点归到次日。
+ */
+function buildEvaluationDatetimes(params) {
+  const {
+    date,
+    config,
+    scheduleTimePoints
+  } = params;
+  const crossDay = (0, _timeSlot.isBusinessHoursCrossDay)(config);
+  const businessStartHour = Number(config.businessStartTime.split(':')[0]);
+  const evalSet = new Set();
+  evalSet.add(`${date} ${config.businessStartTime}`);
+  if (crossDay) {
+    // 即使规则没有显式 00:00 时间点，日期/星期变化也可能切换适用规则。
+    evalSet.add(`${(0, _dayjs.default)(date).add(1, 'day').format('YYYY-MM-DD')} 00:00`);
+  }
+  for (const timePoint of scheduleTimePoints) {
+    const hour = Number(timePoint.split(':')[0]);
+    const pointDate = crossDay && hour < businessStartHour ? (0, _dayjs.default)(date).add(1, 'day').format('YYYY-MM-DD') : date;
+    evalSet.add(`${pointDate} ${timePoint}`);
+  }
+  return Array.from(evalSet).sort((a, b) => {
+    const aMs = (0, _dayjs.default)(a, ['YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm']).valueOf();
+    const bMs = (0, _dayjs.default)(b, ['YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm']).valueOf();
+    return aMs - bMs;
+  });
+}
+
+/** 找到 slot 时间所属分段的评估 datetime（max(evalDt <= slotDt)） */
+function findSegmentEvalDatetime(slotDatetime, evalDatetimes) {
+  if (!evalDatetimes.length) return slotDatetime;
+  const slotMs = (0, _dayjs.default)(slotDatetime, ['YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm']).valueOf();
+  let chosen = evalDatetimes[0];
+  for (const evalDt of evalDatetimes) {
+    const evalMs = (0, _dayjs.default)(evalDt, ['YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm']).valueOf();
+    if (evalMs <= slotMs) {
+      chosen = evalDt;
+    } else {
+      break;
+    }
+  }
+  return chosen;
+}
+
+/** 将 slot 标签转为与 timeSlot 网格一致的 slotStart 字符串 */
+function buildSlotStartDatetime(date, label, config) {
+  const crossDay = (0, _timeSlot.isBusinessHoursCrossDay)(config);
+  const businessStartHour = Number(config.businessStartTime.split(':')[0]);
+  const hour = Number(label.split(':')[0]);
+  const slotDate = crossDay && hour < businessStartHour ? (0, _dayjs.default)(date).add(1, 'day').format('YYYY-MM-DD') : date;
+  return (0, _dayjs.default)(`${slotDate} ${label}`).format('YYYY-MM-DD HH:mm');
+}
+
+/**
+ * 按 schedule 分段批量 resolveProducts，输出与 quotation 相同 key 格式的 slot 价格 Map。
+ * key: `${productId}:${slotStart}`，value: price | null
+ */
+function buildSlotPriceMapByScheduleSegments(params) {
+  const {
+    products,
+    productIds,
+    date,
+    timeLabels,
+    config,
+    context
+  } = params;
+  const map = new Map();
+  if (!productIds.length || !timeLabels.length) return map;
+  const evaluator = context.evaluator;
+  if (!evaluator || typeof evaluator.resolveProducts !== 'function') return map;
+  const strategyConfigs = context.strategyConfigs || (typeof evaluator.getStrategyConfigs === 'function' ? evaluator.getStrategyConfigs() : []);
+  const scheduleTimePoints = typeof evaluator.buildScheduleTimePoints === 'function' ? evaluator.buildScheduleTimePoints(strategyConfigs, context.scheduleList || []) : [];
+  const evalDatetimes = buildEvaluationDatetimes({
+    date,
+    config,
+    scheduleTimePoints
+  });
+  const priceCache = new Map();
+  for (const evalDt of evalDatetimes) {
+    const resolved = formatProductsWithDataVariant(products, context, evalDt);
+    const priceByProductId = new Map();
+    for (const product of resolved) {
+      const productId = Number(product.id);
+      if (!Number.isFinite(productId)) continue;
+      priceByProductId.set(productId, extractProductPrice(product));
+    }
+    priceCache.set(evalDt, priceByProductId);
+  }
+  for (const label of timeLabels) {
+    const slotStart = buildSlotStartDatetime(date, label, config);
+    const segmentEvalDt = findSegmentEvalDatetime(slotStart, evalDatetimes);
+    const priceByProductId = priceCache.get(segmentEvalDt);
+    for (const productId of productIds) {
+      const key = `${productId}:${slotStart}`;
+      const price = priceByProductId?.get(productId) ?? null;
+      if (price !== null) {
+        map.set(key, price);
+      }
+    }
+  }
+  return map;
+}
+
+/**
+ * 指定商品在某一 datetime 的智能定价（addon / 单点重算用）。
+ */
+function getPriceForProductAtDatetime(params) {
+  const {
+    products,
+    context,
+    productId,
+    variantId,
+    datetime,
+    fallbackPrice
+  } = params;
+  const selectedProducts = products.filter(product => Number(product.id) === Number(productId)).map(product => {
+    if (!variantId) return product;
+    const variant = product.variant?.find(item => Number(item.id) === Number(variantId));
+    if (!variant) return product;
+    return {
+      ...product,
+      product_variant_id: variantId,
+      variant_id: variantId,
+      price: variant.price ?? variant.base_price ?? product.price,
+      base_price: variant.base_price ?? variant.price ?? product.base_price
+    };
+  });
+  const resolved = formatProductsWithDataVariant(selectedProducts, context, datetime);
+  const product = resolved.find(item => Number(item.id) === Number(productId));
+  return extractProductPrice(product || {}) ?? fallbackPrice ?? '0.00';
+}
+
+/** 从 slot 价格 Map 读取单价，找不到则回退 fallback */
+function getSlotPriceFromMap(params) {
+  const {
+    slotPriceMap,
+    productId,
+    slotStartTime,
+    fallbackPrice
+  } = params;
+  const key = `${productId}:${slotStartTime}`;
+  const mapped = slotPriceMap.get(key);
+  if (mapped != null) return mapped;
+  return fallbackPrice ?? '0.00';
+}

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

@@ -28,5 +28,6 @@ export declare function buildTimeSlotGrid(params: {
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
     quotationPriceMap?: Map<string, string | null>;
+    slotPriceMap?: Map<string, string | null>;
 }): VenueTimeSlotGrid;
 export {};

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

@@ -166,6 +166,7 @@ function buildProductSlots(params) {
     now,
     crossDay,
     quotationPriceMap,
+    slotPriceMap,
     childRawResources,
     childTimesCache,
     childEventsCache,
@@ -230,7 +231,7 @@ function buildProductSlots(params) {
       startTime: slotStartStr,
       endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
       status,
-      price: isBookable ? quotationPriceMap?.get(`${mapping.productId}:${slotStartStr}`) ?? mapping.price : null,
+      price: isBookable ? (slotPriceMap ?? quotationPriceMap)?.get(`${mapping.productId}:${slotStartStr}`) ?? mapping.price : null,
       resourceId: resource.resourceId,
       resourceFormId: resource.formId,
       capacity: status === 'past' || status === 'unavailable' ? null : resCapacity,
@@ -246,7 +247,8 @@ function buildTimeSlotGrid(params) {
     config,
     rawResources,
     resourceProductMap,
-    quotationPriceMap
+    quotationPriceMap,
+    slotPriceMap
   } = params;
   const timeLabels = generateTimeLabels(config);
   const now = (0, _dayjs.default)();
@@ -279,6 +281,7 @@ function buildTimeSlotGrid(params) {
         now,
         crossDay,
         quotationPriceMap,
+        slotPriceMap,
         childRawResources,
         childTimesCache,
         childEventsCache,

package/lib/solution/index.d.ts

@@ -9,3 +9,4 @@ export * from './ScanOrder';
 export * from './BaseSales';
 export * from './VenueBooking';
 export * from './UnifiedBookingSales';
+export * from './OrderInvoicePreview';

package/lib/solution/index.js

@@ -123,4 +123,15 @@ Object.keys(_UnifiedBookingSales).forEach(function (key) {
       return _UnifiedBookingSales[key];
     }
   });
+});
+var _OrderInvoicePreview = require("./OrderInvoicePreview");
+Object.keys(_OrderInvoicePreview).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _OrderInvoicePreview[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _OrderInvoicePreview[key];
+    }
+  });
 });

package/package.json

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