@pisell/pisellos 2.3.82 → 2.3.84

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

@@ -7,5 +7,6 @@ export declare function buildDateRangeSummary(params: {
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
     quotationModule?: QuotationModule;
+    channel?: string;
     resolveConfig?: (date: string) => VenueBookingSlotConfig;
 }): VenueDateSummaryItem[];

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

@@ -14,6 +14,7 @@ export function buildDateRangeSummary(params) {
     rawResources = params.rawResources,
     resourceProductMap = params.resourceProductMap,
     quotationModule = params.quotationModule,
+    channel = params.channel,
     resolveConfig = params.resolveConfig;
   var result = [];
   var productIds = quotationModule ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).flat().map(function (m) {
@@ -32,7 +33,8 @@ export function buildDateRangeSummary(params) {
       });
       quotationPriceMap = quotationModule.buildProductPriceMap({
         productIds: productIds,
-        timePoints: timePoints
+        timePoints: timePoints,
+        channel: channel
       });
     }
     var grid = buildTimeSlotGrid({

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

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

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

@@ -53,6 +53,7 @@ export function mergeConsecutiveSlots(slots) {
 export function buildPriceBreakdown(params) {
   var group = params.group,
     productId = params.productId,
+    channel = params.channel,
     quotation = params.quotation;
   if (!group.slots.length) return [];
   var entries = [];
@@ -64,7 +65,8 @@ export function buildPriceBreakdown(params) {
       var unitPrice = Number(slot.price || '0');
       var shelfId = quotation ? quotation.getQuotationShelfId({
         productId: productId,
-        datetime: slot.startTime
+        datetime: slot.startTime,
+        channel: channel
       }) : 0;
       var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/modules/BookingContext/index.d.ts

@@ -19,12 +19,15 @@ export declare class BookingContextModule extends BaseModule implements Module,
     protected defaultVersion: string;
     private request;
     private store;
+    private otherParams;
     /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
     private lastConfigQueryKey;
     /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
     private lastResourcesQueryKey;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    /** 同步父级解决方案的运行态参数；platform 变化后会自然切换 config endpoint/cache key。 */
+    updateOtherParams(params: Record<string, any>): void;
     loadBookingConfig(params?: LoadBookingConfigParams, options?: {
         forceRefresh?: boolean;
     }): Promise<BookingContextConfig | null>;

package/lib/modules/BookingContext/index.js

@@ -16,6 +16,7 @@ exports.buildBookingResourcesQueryKey = buildBookingResourcesQueryKey;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _BaseModule = require("../BaseModule");
 var _request = require("../../plugins/request");
+var _platform = require("../../utils/platform");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -52,6 +53,8 @@ const DEFAULT_BOOKING_CONFIG_PARAMS = {
   item_type: 'appointment_booking',
   sub_type: 'ticket'
 };
+const BOOKING_CONFIG_ENDPOINT = '/core/board/management/config';
+const H5_BOOKING_CONFIG_ENDPOINT = '/core/board/config';
 const BOARD_CONFIG_CACHE = {
   useCache: true,
   cache: {
@@ -167,6 +170,26 @@ function buildBookingConfigQueryKey(params = {}) {
   });
   return JSON.stringify(sorted);
 }
+function resolveBookingConfigRequest(platform, params = {}) {
+  const isH5 = (0, _platform.normalizeRuntimePlatform)(platform) === 'h5';
+  const endpoint = isH5 ? H5_BOOKING_CONFIG_ENDPOINT : BOOKING_CONFIG_ENDPOINT;
+  const query = isH5 ? {
+    item_type: params.item_type || DEFAULT_BOOKING_CONFIG_PARAMS.item_type
+  } : {
+    ...DEFAULT_BOOKING_CONFIG_PARAMS,
+    ...params
+  };
+  const keys = Object.keys(query).sort();
+  const sortedQuery = {};
+  keys.forEach(key => {
+    sortedQuery[key] = query[key];
+  });
+  return {
+    endpoint,
+    query,
+    key: `${endpoint}:${JSON.stringify(sortedQuery)}`
+  };
+}
 
 /** 稳定序列化资源列表查询（date + bookingIds），用于跳过重复 loadResources。 */
 function buildBookingResourcesQueryKey(params = {}) {
@@ -181,6 +204,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
   store = {
     ...EMPTY_STATE
   };
+  otherParams = {};
   /** 上次成功 loadBookingConfig 的 query key；命中则不再请求。 */
   lastConfigQueryKey = null;
   /** 上次成功 loadResources 的 query key（date|bookingIds）；命中则不再请求。 */
@@ -194,6 +218,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
     if (!this.request) {
       throw new Error('BookingContextModule 需要 request 插件支持');
     }
+    this.otherParams = options.otherParams || {};
     this.store = {
       bookingConfig: null,
       resourcesOrigin: [],
@@ -212,15 +237,17 @@ class BookingContextModule extends _BaseModule.BaseModule {
       this.store.date = initialState.date;
     }
   }
+
+  /** 同步父级解决方案的运行态参数；platform 变化后会自然切换 config endpoint/cache key。 */
+  updateOtherParams(params) {
+    this.otherParams = params || {};
+  }
   async loadBookingConfig(params = {}, options = {}) {
-    const configKey = buildBookingConfigQueryKey(params);
+    const requestConfig = resolveBookingConfigRequest(this.otherParams?.platform, params);
+    const configKey = requestConfig.key;
     if (!options.forceRefresh && this.store.bookingConfig != null && this.lastConfigQueryKey === configKey) {
       return this.store.bookingConfig;
     }
-    const query = {
-      ...DEFAULT_BOOKING_CONFIG_PARAMS,
-      ...params
-    };
     const sharedKey = buildSharedCacheKey(this.request, configKey);
     if (!options.forceRefresh && sharedBookingConfigCache.has(sharedKey)) {
       const cached = sharedBookingConfigCache.get(sharedKey) ?? null;
@@ -232,7 +259,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
     if (!pending) {
       const requestPromise = (async () => {
         try {
-          const res = await this.request.get('/core/board/management/config', query, BOARD_CONFIG_CACHE);
+          const res = await this.request.get(requestConfig.endpoint, requestConfig.query, BOARD_CONFIG_CACHE);
           const config = res?.data ?? null;
           sharedBookingConfigCache.set(sharedKey, config);
           return config;
@@ -293,7 +320,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
    * store 内是否已具备与本次 init 入参等价的 config / resources（不再打接口）。
    */
   isBookingContextReady(params = {}) {
-    const configKey = buildBookingConfigQueryKey(params.bookingConfigParams);
+    const configKey = resolveBookingConfigRequest(this.otherParams?.platform, params.bookingConfigParams).key;
     const dateInput = params.date ?? this.store.date ?? (0, _dayjs.default)();
     const queryDate = toScheduleQueryDate(dateInput);
     const resourcesKey = buildBookingResourcesQueryKey({
@@ -311,7 +338,7 @@ class BookingContextModule extends _BaseModule.BaseModule {
     if (!params.forceRefresh && this.isBookingContextReady(params)) {
       return this.getState();
     }
-    const configKey = buildBookingConfigQueryKey(params.bookingConfigParams);
+    const configKey = resolveBookingConfigRequest(this.otherParams?.platform, params.bookingConfigParams).key;
     const resourcesKey = buildBookingResourcesQueryKey({
       date: queryDate,
       bookingIds: params.bookingIds

package/lib/modules/BookingContext/types.d.ts

@@ -1,7 +1,7 @@
 /**
  * BookingContext 子模块：承载「预约 UI 上下文」三件套。
  *
- *  - bookingConfig：来自 `/core/board/management/config` 的整套预约配置（service_time / resource_tab /
+ *  - bookingConfig：来自 staff `/core/board/management/config` 或 H5 `/core/board/config` 的整套预约配置（service_time / resource_tab /
  *    appointment_subject / subject_require / stock_setting / basic / capacity 等）。
  *  - resourcesOrigin / resourcesOriginMap：来自 `/schedule/resource/list` 的资源全集，含 times / event_list /
  *    combined_resource 等运行态信息，是 getResourceByIds / getResourceTimeIsUsable 的输入。
@@ -11,7 +11,7 @@
  *  - 默认由 `loadBookingConfig` / `loadResources` 拉取并写入 store；也支持消费方 `set*` 直接灌入（复用 ticketBooking 已拉到的数据）。
  *  - 所有读 API 返回浅克隆（数组）或原引用（map / config），避免 UI 写穿。
  */
-/** `loadBookingConfig` 入参，与 ticketBooking `getBookingConfig` 一致。 */
+/** `loadBookingConfig` 入参；H5 公共接口只消费 `item_type`。 */
 export interface LoadBookingConfigParams {
     item_type?: string;
     sub_type?: string;
@@ -42,7 +42,7 @@ export interface InitBookingContextParams {
 export type BookingContextResource = Record<string, any>;
 export type BookingContextResourceMap = Record<string, BookingContextResource>;
 /**
- * 形参 booking_config（结构来自 `/core/board/management/config` 接口）。
+ * 形参 booking_config（结构来自 staff management 或 H5 board config 接口的 `data`）。
  * OS 不强制 schema，保留 `Record<string, any>` 兼容现网；常用路径文档化在 SDK docs。
  */
 export type BookingContextConfig = Record<string, any>;
@@ -80,7 +80,7 @@ export interface BookingContextModuleAPI {
     getState(): BookingContextState;
     /** 一键清空，destroy / 切租户场景用。 */
     clear(): void;
-    /** 拉取 board config 并写入 store（`/core/board/management/config`）。 */
+    /** 按运行平台拉取 board config 并写入 store。 */
     loadBookingConfig(params?: LoadBookingConfigParams): Promise<BookingContextConfig | null>;
     /** 拉取资源全集并写入 store（`/schedule/resource/list`）。 */
     loadResources(params?: LoadBookingResourcesParams): Promise<BookingContextResource[]>;

package/lib/modules/BookingContext/types.js

@@ -7,7 +7,7 @@ exports.BookingContextEvent = void 0;
 /**
  * BookingContext 子模块：承载「预约 UI 上下文」三件套。
  *
- *  - bookingConfig：来自 `/core/board/management/config` 的整套预约配置（service_time / resource_tab /
+ *  - bookingConfig：来自 staff `/core/board/management/config` 或 H5 `/core/board/config` 的整套预约配置（service_time / resource_tab /
  *    appointment_subject / subject_require / stock_setting / basic / capacity 等）。
  *  - resourcesOrigin / resourcesOriginMap：来自 `/schedule/resource/list` 的资源全集，含 times / event_list /
  *    combined_resource 等运行态信息，是 getResourceByIds / getResourceTimeIsUsable 的输入。
@@ -17,7 +17,7 @@ exports.BookingContextEvent = void 0;
  *  - 默认由 `loadBookingConfig` / `loadResources` 拉取并写入 store；也支持消费方 `set*` 直接灌入（复用 ticketBooking 已拉到的数据）。
  *  - 所有读 API 返回浅克隆（数组）或原引用（map / config），避免 UI 写穿。
  */
-/** `loadBookingConfig` 入参，与 ticketBooking `getBookingConfig` 一致。 */
+/** `loadBookingConfig` 入参；H5 公共接口只消费 `item_type`。 */
 /** `loadResources` 入参，与 info2 `getResourceList` 一致。 */
 /** `initBookingContext` 入参（BookingTicket 聚合入口）。 */
 /**
@@ -25,7 +25,7 @@ exports.BookingContextEvent = void 0;
  * 这里只声明 Record 形态；具体字段保留 `any`，与 ticketBooking 现网传入的数据形状兼容。
  */
 /**
- * 形参 booking_config（结构来自 `/core/board/management/config` 接口）。
+ * 形参 booking_config（结构来自 staff management 或 H5 board config 接口的 `data`）。
  * OS 不强制 schema，保留 `Record<string, any>` 兼容现网；常用路径文档化在 SDK docs。
  */
 /**

package/lib/modules/Quotation/index.d.ts

@@ -11,12 +11,23 @@ export declare class QuotationModule extends BaseModule implements Module {
     private scheduleResolver?;
     private app;
     private quotationListUpdatedListener?;
+    private quotationCache;
+    private quotationLoadPromises;
+    private quotationCacheVersions;
+    private lifecycleGeneration;
+    private activeChannelKey;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     loadQuotations(params?: {
         channel?: string;
         customer_id?: number | string;
     }): Promise<void>;
+    ensureQuotations(params?: {
+        channel?: string;
+        customer_id?: number | string;
+    }): Promise<void>;
+    invalidateQuotationCache(channel?: string): void;
+    private fetchQuotations;
     getQuotationList(): QuotationItem[];
     setQuotationListUpdatedListener(listener?: () => void): void;
     getQuotationCustomerScopeInfo(): QuotationCustomerScopeInfo;
@@ -60,12 +71,17 @@ export declare class QuotationModule extends BaseModule implements Module {
     buildProductPriceMap(params: {
         productIds: number[];
         timePoints: string[];
+        channel?: string;
         customer_id?: number | string;
     }): Map<string, string | null>;
     setScheduleResolver(resolver: (id: number) => ScheduleItem | undefined): void;
     private applyQuotationResponse;
     private notifyQuotationListUpdated;
     private getQuotationCacheKeyData;
+    private normalizeChannel;
+    private activateChannel;
+    private getQuotationCacheVersion;
+    private bumpQuotationCacheVersion;
     private isQuotationVisibleForCustomer;
     private hasValidCustomerId;
     private normalizeCustomerId;

package/lib/modules/Quotation/index.js

@@ -16,6 +16,11 @@ class QuotationModule extends _BaseModule.BaseModule {
   scheduleResolver;
   app;
   quotationListUpdatedListener;
+  quotationCache = new Map();
+  quotationLoadPromises = new Map();
+  quotationCacheVersions = new Map();
+  lifecycleGeneration = 0;
+  activeChannelKey = '';
   constructor(name, version) {
     super(name, version);
   }
@@ -27,17 +32,93 @@ class QuotationModule extends _BaseModule.BaseModule {
     this.store = {
       list: []
     };
+    this.quotationCache.clear();
+    this.quotationLoadPromises.clear();
+    this.quotationCacheVersions.clear();
+    this.activeChannelKey = '';
+    this.lifecycleGeneration += 1;
   }
   async loadQuotations(params) {
-    const query = {};
-    if (params?.channel) query.channel = params.channel;
-    if (params?.channel === 'online_store') {
-      query.channel = 'online-store';
+    const channelKey = this.normalizeChannel(params?.channel);
+    const cacheVersion = this.bumpQuotationCacheVersion(channelKey);
+    const lifecycleGeneration = this.lifecycleGeneration;
+    this.activateChannel(channelKey);
+    const loadPromise = this.fetchQuotations({
+      channelKey,
+      cacheVersion,
+      lifecycleGeneration
+    });
+    this.quotationLoadPromises.set(channelKey, loadPromise);
+    try {
+      await loadPromise;
+    } finally {
+      if (this.quotationLoadPromises.get(channelKey) === loadPromise) {
+        this.quotationLoadPromises.delete(channelKey);
+      }
+    }
+  }
+  async ensureQuotations(params) {
+    const channelKey = this.normalizeChannel(params?.channel);
+    const lifecycleGeneration = this.lifecycleGeneration;
+    while (true) {
+      if (this.lifecycleGeneration !== lifecycleGeneration) return;
+      if (this.quotationCache.has(channelKey)) {
+        this.activateChannel(channelKey);
+        return;
+      }
+      const pending = this.quotationLoadPromises.get(channelKey);
+      if (!pending) {
+        try {
+          await this.loadQuotations(params);
+        } catch (error) {
+          if (this.quotationCache.has(channelKey)) {
+            this.activateChannel(channelKey);
+            return;
+          }
+          if (this.quotationLoadPromises.has(channelKey)) continue;
+          throw error;
+        }
+        continue;
+      }
+      const cacheVersion = this.getQuotationCacheVersion(channelKey);
+      try {
+        await pending;
+      } catch (error) {
+        const latestPending = this.quotationLoadPromises.get(channelKey);
+        if (latestPending && latestPending !== pending) continue;
+        if (this.getQuotationCacheVersion(channelKey) !== cacheVersion) continue;
+        throw error;
+      }
+      if (this.quotationCache.has(channelKey)) {
+        this.activateChannel(channelKey);
+        return;
+      }
+      const latestPending = this.quotationLoadPromises.get(channelKey);
+      if (latestPending && latestPending !== pending) continue;
+    }
+  }
+  invalidateQuotationCache(channel) {
+    if (channel !== undefined) {
+      const channelKey = this.normalizeChannel(channel);
+      this.bumpQuotationCacheVersion(channelKey);
+      this.quotationCache.delete(channelKey);
+      this.quotationLoadPromises.delete(channelKey);
+      if (this.activeChannelKey === channelKey) this.store.list = [];
+      return;
     }
+    const channelKeys = new Set([...this.quotationCache.keys(), ...this.quotationLoadPromises.keys(), ...this.quotationCacheVersions.keys(), this.activeChannelKey]);
+    channelKeys.forEach(channelKey => this.bumpQuotationCacheVersion(channelKey));
+    this.quotationCache.clear();
+    this.quotationLoadPromises.clear();
+    this.store.list = [];
+  }
+  async fetchQuotations(params) {
+    const query = {};
+    if (params.channelKey) query.channel = params.channelKey;
     let initialResultApplied = false;
     const applyRemoteUpdate = response => {
-      this.applyQuotationResponse(response);
-      if (initialResultApplied) {
+      const applied = this.applyQuotationResponse(response, params);
+      if (applied && initialResultApplied && this.activeChannelKey === params.channelKey) {
         this.notifyQuotationListUpdated();
       }
     };
@@ -49,7 +130,7 @@ class QuotationModule extends _BaseModule.BaseModule {
       },
       cacheUpdateChange: applyRemoteUpdate
     });
-    this.applyQuotationResponse(res);
+    this.applyQuotationResponse(res, params);
     initialResultApplied = true;
   }
   getQuotationList() {
@@ -109,7 +190,8 @@ class QuotationModule extends _BaseModule.BaseModule {
       datetime,
       customer_id
     } = params;
-    for (const quotation of this.store.list) {
+    const quotations = params.channel === undefined ? this.store.list : this.quotationCache.get(this.normalizeChannel(params.channel)) || [];
+    for (const quotation of quotations) {
       const visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
       if (!visible) continue;
       const active = this.isQuotationActiveAt(quotation, datetime);
@@ -135,13 +217,15 @@ class QuotationModule extends _BaseModule.BaseModule {
    */
   buildProductPriceMap(params) {
     const map = new Map();
-    if (!this.store.list.length) return map;
+    const quotations = params.channel === undefined ? this.store.list : this.quotationCache.get(this.normalizeChannel(params.channel)) || [];
+    if (!quotations.length) return map;
     for (const productId of params.productIds) {
       for (const timePoint of params.timePoints) {
         const key = `${productId}:${timePoint}`;
         const price = this.getPriceForProduct({
           productId,
           datetime: timePoint,
+          channel: params.channel,
           customer_id: params.customer_id
         });
         if (price !== null) {
@@ -154,9 +238,15 @@ class QuotationModule extends _BaseModule.BaseModule {
   setScheduleResolver(resolver) {
     this.scheduleResolver = resolver;
   }
-  applyQuotationResponse(response) {
+  applyQuotationResponse(response, params) {
     const source = response?.data?.list || response?.list || [];
-    this.store.list = [...source].sort((a, b) => Number(b.sort || 0) - Number(a.sort || 0));
+    const list = [...source].sort((a, b) => Number(b.sort || 0) - Number(a.sort || 0));
+    if (this.lifecycleGeneration !== params.lifecycleGeneration || this.getQuotationCacheVersion(params.channelKey) !== params.cacheVersion) {
+      return false;
+    }
+    this.quotationCache.set(params.channelKey, list);
+    if (this.activeChannelKey === params.channelKey) this.store.list = list;
+    return true;
   }
   notifyQuotationListUpdated() {
     try {
@@ -179,6 +269,22 @@ class QuotationModule extends _BaseModule.BaseModule {
       shop_id: shopId
     };
   }
+  normalizeChannel(channel) {
+    const normalized = channel?.trim().toLowerCase() || '';
+    return normalized === 'online_store' ? 'online-store' : normalized;
+  }
+  activateChannel(channelKey) {
+    this.activeChannelKey = channelKey;
+    this.store.list = this.quotationCache.get(channelKey) || [];
+  }
+  getQuotationCacheVersion(channelKey) {
+    return this.quotationCacheVersions.get(channelKey) || 0;
+  }
+  bumpQuotationCacheVersion(channelKey) {
+    const nextVersion = this.getQuotationCacheVersion(channelKey) + 1;
+    this.quotationCacheVersions.set(channelKey, nextVersion);
+    return nextVersion;
+  }
   isQuotationVisibleForCustomer(quotation, customerId) {
     const customers = quotation.customer || [];
     if (customers.length === 0) return true;

package/lib/solution/BaseSales/index.js

@@ -639,8 +639,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async loadQuotationForPriceQuery(params) {
     if (!params.quotation) return;
     this.applyQuotationScheduleResolver(params.quotation);
-    await params.quotation.loadQuotations({
-      channel: params.channel || this.otherParams?.channel,
+    const quotation = params.quotation;
+    const load = typeof quotation.ensureQuotations === 'function' ? quotation.ensureQuotations.bind(quotation) : quotation.loadQuotations.bind(quotation);
+    await load({
+      channel: this.getPriceQueryChannel(params.channel),
       customer_id: params.customer_id
     });
   }
@@ -3153,22 +3155,24 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const quotation = useCustomerUserPricing ? undefined : this.store.quotation;
     const customerId = params.customer_id ?? this.getCurrentOrderCustomerId();
     await this.prepareProductPriceQueryContext(customerId);
+    const channel = this.getPriceQueryChannel(params.channel);
     const [authoritativeProduct] = await this.resolveProductsForPriceQuery({
       priceQueries: [params],
       schedule: this.getPriceQuerySchedule(params),
       customerId,
-      channel: params.channel
+      channel
     });
     const product = this.mergeProductForPriceQuery(params.product, authoritativeProduct);
     if (!useCustomerUserPricing) {
       await this.loadQuotationForPriceQuery({
         quotation,
         customer_id: customerId,
-        channel: params.channel
+        channel
       });
     }
     return (0, _quotationPrice.calculateBaseSalesProductBookingPrice)({
       ...params,
+      channel,
       product,
       fallback_price: authoritativeProduct ? undefined : params.fallback_price,
       customer_id: customerId,
@@ -3242,11 +3246,12 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     const useCustomerUserPricing = this.isCustomerUserPriceQuery();
     const quotation = useCustomerUserPricing ? undefined : this.store.quotation;
     const currentOrderCustomerId = this.getCurrentOrderCustomerId();
+    const resolvedChannels = paramsList.map(params => this.getPriceQueryChannel(params.channel));
     const authoritativeProducts = paramsList.map(() => null);
     const groups = new Map();
     paramsList.forEach((params, index) => {
       const schedule = this.getPriceQuerySchedule(params);
-      const channel = this.getPriceQueryChannel(params.channel);
+      const channel = resolvedChannels[index];
       const customerId = params.customer_id ?? currentOrderCustomerId;
       const groupKey = [schedule.schedule_date, schedule.schedule_datetime, channel || '', this.normalizePriceContextCustomerId(customerId) || ''].join('|');
       const group = groups.get(groupKey) || {
@@ -3272,19 +3277,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     }));
     if (!useCustomerUserPricing) {
-      await this.loadQuotationForPriceQuery({
-        quotation,
-        customer_id: paramsList[0]?.customer_id ?? currentOrderCustomerId,
-        channel: paramsList[0]?.channel
+      const quotationContexts = new Map();
+      paramsList.forEach((params, index) => {
+        const channel = resolvedChannels[index];
+        const key = channel || '';
+        if (quotationContexts.has(key)) return;
+        quotationContexts.set(key, {
+          channel,
+          customer_id: params.customer_id ?? currentOrderCustomerId
+        });
       });
+      await Promise.all(Array.from(quotationContexts.values()).map(context => this.loadQuotationForPriceQuery({
+        quotation,
+        ...context
+      })));
     }
     return paramsList.map((params, index) => {
       const productInput = params.product || {};
       const authoritativeProduct = authoritativeProducts[index];
       const product = this.mergeProductForPriceQuery(productInput, authoritativeProduct);
       const customerId = params.customer_id ?? currentOrderCustomerId;
+      const channel = resolvedChannels[index];
       return (0, _quotationPrice.calculateBaseSalesProductBookingPrice)({
         ...params,
+        channel,
         product,
         fallback_price: authoritativeProduct ? undefined : params.fallback_price,
         customer_id: customerId,

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -334,7 +334,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -90,6 +90,8 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
     loadAddonProducts(): Promise<ProductData[]>;
     getVenueProducts(): ProductData[];
     getAddonProductsList(): ProductData[];
+    private ensureQuotationsLoaded;
+    private preloadQuotations;
     loadQuotations(params?: {
         channel?: string;
     }): Promise<void>;