@pisell/pisellos 0.10.20 → 0.10.22

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/dist/utils/platform.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Normalize the runtime platform passed through solution/module otherParams.
+ */
+export declare function normalizeRuntimePlatform(platform: unknown): string;
+/**
+ * PC and H5 are authenticated-customer clients rather than staff terminals.
+ */
+export declare function isCustomerUserPlatform(platform: unknown): boolean;

package/dist/utils/platform.js

@@ -0,0 +1,15 @@
+var CUSTOMER_USER_PLATFORMS = new Set(['pc', 'h5']);
+
+/**
+ * Normalize the runtime platform passed through solution/module otherParams.
+ */
+export function normalizeRuntimePlatform(platform) {
+  return String(platform !== null && platform !== void 0 ? platform : '').trim().toLowerCase();
+}
+
+/**
+ * PC and H5 are authenticated-customer clients rather than staff terminals.
+ */
+export function isCustomerUserPlatform(platform) {
+  return CUSTOMER_USER_PLATFORMS.has(normalizeRuntimePlatform(platform));
+}

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/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -181,6 +181,7 @@ function buildCacheItemFromOrderLine(input) {
     booking,
     sourceProduct
   } = input;
+  const holderConfig = sourceProduct?.holder_config ?? sourceProduct?.origin?.holder_config ?? product.metadata?.holder_config;
   const resolvedId = product.product_id ?? sourceProduct?.id;
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
@@ -249,6 +250,9 @@ function buildCacheItemFromOrderLine(input) {
   }
   const base = {
     ...(sourceProduct || {}),
+    ...(holderConfig !== undefined && holderConfig !== null ? {
+      holder_config: holderConfig
+    } : {}),
     id: resolvedId,
     product_id: resolvedId,
     extension_type: sourceProduct?.extension_type ?? booking?.product?.extension_type ?? sourceProduct?.extension_type,

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

@@ -3,7 +3,7 @@ import { BaseModule } from '../BaseModule';
 import type { ScheduleModule } from '../Schedule';
 import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export * from './types';
-export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales, } from './utils';
+export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceLayoutFromTemplateSettings, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales, } from './utils';
 export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -16,6 +16,9 @@ export declare class OpenDataModule extends BaseModule implements Module {
     private fatherModule;
     private otherParams;
     private fetchRevision;
+    private invoiceTemplateCacheRevision;
+    private invoiceTemplateDocumentCache;
+    private invoiceTemplateDocumentInFlight;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
     /**
@@ -29,6 +32,12 @@ export declare class OpenDataModule extends BaseModule implements Module {
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;
     getInvoiceTemplateSettings(): InvoiceTemplateSettings;
+    ensureInvoiceTemplateSettings(target: string): Promise<InvoiceTemplateSettings>;
+    private commitInvoiceTemplateSettings;
+    private resolveInvoiceTemplateSettings;
+    private buildInvoiceTemplateCacheKey;
+    private fetchInvoiceTemplateDocument;
+    private logInvoiceTemplateDocumentFallback;
     getLastFetchedAt(): number | null;
     /** 清除内存与 sessionStorage 镜像中的 OpenData，供宿主切店时调用。 */
     clearCache(): void;

package/lib/modules/OpenData/index.js

@@ -9,6 +9,7 @@ var _exportNames = {
   getDefaultInvoiceLayoutConfig: true,
   getDefaultInvoiceTemplateSettings: true,
   normalizeInvoiceLayoutConfig: true,
+  normalizeInvoiceLayoutFromTemplateSettings: true,
   normalizeInvoiceTemplateSettings: true,
   normalizeRawInvoiceTemplateSettings: true,
   resolveInvoiceReceiptLocales: true
@@ -38,6 +39,12 @@ Object.defineProperty(exports, "normalizeInvoiceLayoutConfig", {
     return _utils.normalizeInvoiceLayoutConfig;
   }
 });
+Object.defineProperty(exports, "normalizeInvoiceLayoutFromTemplateSettings", {
+  enumerable: true,
+  get: function () {
+    return _utils.normalizeInvoiceLayoutFromTemplateSettings;
+  }
+});
 Object.defineProperty(exports, "normalizeInvoiceTemplateSettings", {
   enumerable: true,
   get: function () {
@@ -70,6 +77,25 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+function isRecord(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function resolveInvoiceDocumentId(value) {
+  if (typeof value === 'number') {
+    return Number.isSafeInteger(value) && value > 0 ? String(value) : null;
+  }
+  if (typeof value !== 'string') return null;
+  const normalized = value.trim();
+  if (!/^\d+$/.test(normalized)) return null;
+  const numericId = Number(normalized);
+  return Number.isSafeInteger(numericId) && numericId > 0 ? String(numericId) : null;
+}
+function isLegacyInvoiceTemplate(value) {
+  if (typeof value !== 'string' || value.trim().length === 0) return false;
+  const normalized = value.trim();
+  const numericLike = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i;
+  return !numericLike.test(normalized);
+}
 class OpenDataModule extends _BaseModule.BaseModule {
   defaultName = 'openData';
   defaultVersion = '1.0.0';
@@ -82,6 +108,9 @@ class OpenDataModule extends _BaseModule.BaseModule {
   fatherModule;
   otherParams = {};
   fetchRevision = 0;
+  invoiceTemplateCacheRevision = 0;
+  invoiceTemplateDocumentCache = new Map();
+  invoiceTemplateDocumentInFlight = new Map();
   constructor(name, version) {
     super(name, version);
   }
@@ -90,6 +119,12 @@ class OpenDataModule extends _BaseModule.BaseModule {
     this.store = options.store;
     this.store.data = options.initialState?.data ?? null;
     this.store.lastFetchedAt = options.initialState?.lastFetchedAt ?? null;
+    // Document 解析结果只在当前模块实例内复用。页面刷新后即使恢复了原始
+    // OpenData，也必须重新查询一次 NocoBase，以取得当前模板内容。
+    this.store.invoiceTemplateSettings = null;
+    this.store.invoiceTemplateTarget = null;
+    this.store.invoiceTemplateDocumentId = null;
+    this.store.invoiceTemplateCacheKey = null;
     this.otherParams = options.otherParams || {};
     if (this.otherParams.cacheId) {
       this.openCache = this.otherParams.openCache ?? false;
@@ -139,10 +174,12 @@ class OpenDataModule extends _BaseModule.BaseModule {
       throw new Error(response?.message || '获取 OpenData 配置失败');
     }
     const data = response?.data || {};
+    const resolvedInvoiceTemplate = await this.resolveInvoiceTemplateSettings(data, params.target);
     // clearCache() 或后续请求发生后，旧响应不得复活已失效的 target 配置。
     if (fetchRevision === this.fetchRevision) {
       this.store.data = data;
       this.store.lastFetchedAt = Date.now();
+      this.commitInvoiceTemplateSettings(params.target, resolvedInvoiceTemplate);
     }
     return data;
   }
@@ -150,10 +187,126 @@ class OpenDataModule extends _BaseModule.BaseModule {
     return this.store.data;
   }
   getInvoiceLayoutConfig() {
-    return (0, _utils.normalizeInvoiceLayoutConfig)(this.store.data);
+    return (0, _utils.normalizeInvoiceLayoutFromTemplateSettings)(this.getInvoiceTemplateSettings());
   }
   getInvoiceTemplateSettings() {
-    return (0, _utils.normalizeInvoiceTemplateSettings)(this.store.data);
+    if (isRecord(this.store.invoiceTemplateSettings)) {
+      const documentId = resolveInvoiceDocumentId(this.store.data?.['documents.invoice_template']);
+      if (documentId) {
+        const target = this.store.invoiceTemplateTarget;
+        if (!target || this.store.invoiceTemplateCacheKey !== this.buildInvoiceTemplateCacheKey(target, documentId)) {
+          return (0, _utils.getDefaultInvoiceTemplateSettings)();
+        }
+      }
+      return (0, _utils.normalizeRawInvoiceTemplateSettings)(this.store.invoiceTemplateSettings);
+    }
+    if (isLegacyInvoiceTemplate(this.store.data?.['documents.invoice_template'])) {
+      return (0, _utils.normalizeInvoiceTemplateSettings)(this.store.data);
+    }
+    return (0, _utils.getDefaultInvoiceTemplateSettings)();
+  }
+  async ensureInvoiceTemplateSettings(target) {
+    const normalizedTarget = String(target || '').trim();
+    const config = this.store.data;
+    if (!normalizedTarget || !config) {
+      return (0, _utils.getDefaultInvoiceTemplateSettings)();
+    }
+    const fetchRevision = this.fetchRevision;
+    const resolved = await this.resolveInvoiceTemplateSettings(config, normalizedTarget);
+    if (fetchRevision !== this.fetchRevision || this.store.data !== config) {
+      return (0, _utils.getDefaultInvoiceTemplateSettings)();
+    }
+    this.commitInvoiceTemplateSettings(normalizedTarget, resolved);
+    return (0, _utils.normalizeRawInvoiceTemplateSettings)(resolved.settings);
+  }
+  commitInvoiceTemplateSettings(target, resolved) {
+    this.store.invoiceTemplateSettings = (0, _utils.normalizeRawInvoiceTemplateSettings)(resolved.settings);
+    this.store.invoiceTemplateTarget = target;
+    this.store.invoiceTemplateDocumentId = resolved.documentId;
+    this.store.invoiceTemplateCacheKey = resolved.cacheKey;
+  }
+  async resolveInvoiceTemplateSettings(config, target) {
+    const rawTemplate = config['documents.invoice_template'];
+    const documentId = resolveInvoiceDocumentId(rawTemplate);
+    if (!documentId) {
+      return {
+        settings: isLegacyInvoiceTemplate(rawTemplate) ? (0, _utils.normalizeInvoiceTemplateSettings)(config) : (0, _utils.getDefaultInvoiceTemplateSettings)(),
+        documentId: null,
+        cacheKey: null
+      };
+    }
+    const cacheKey = this.buildInvoiceTemplateCacheKey(target, documentId);
+    if (this.store.invoiceTemplateTarget === target && this.store.invoiceTemplateDocumentId === documentId && this.store.invoiceTemplateCacheKey === cacheKey && isRecord(this.store.invoiceTemplateSettings)) {
+      return {
+        settings: (0, _utils.normalizeRawInvoiceTemplateSettings)(this.store.invoiceTemplateSettings),
+        documentId,
+        cacheKey
+      };
+    }
+    const cachedSettings = this.invoiceTemplateDocumentCache.get(cacheKey);
+    if (cachedSettings) {
+      return {
+        settings: (0, _utils.normalizeRawInvoiceTemplateSettings)(cachedSettings),
+        documentId,
+        cacheKey
+      };
+    }
+    let request = this.invoiceTemplateDocumentInFlight.get(cacheKey);
+    if (!request) {
+      const cacheRevision = this.invoiceTemplateCacheRevision;
+      request = this.fetchInvoiceTemplateDocument(documentId).catch(error => {
+        this.logInvoiceTemplateDocumentFallback(error, target, documentId);
+        return (0, _utils.getDefaultInvoiceTemplateSettings)();
+      }).then(settings => {
+        const normalized = (0, _utils.normalizeRawInvoiceTemplateSettings)(settings);
+        if (cacheRevision === this.invoiceTemplateCacheRevision) {
+          this.invoiceTemplateDocumentCache.set(cacheKey, normalized);
+        }
+        return normalized;
+      }).finally(() => {
+        if (this.invoiceTemplateDocumentInFlight.get(cacheKey) === request) {
+          this.invoiceTemplateDocumentInFlight.delete(cacheKey);
+        }
+      });
+      this.invoiceTemplateDocumentInFlight.set(cacheKey, request);
+    }
+    return {
+      settings: await request,
+      documentId,
+      cacheKey
+    };
+  }
+  buildInvoiceTemplateCacheKey(target, documentId) {
+    const getData = this.appPlugin?.getData?.();
+    return JSON.stringify([getData?.('tenant_id') ?? null, getData?.('shop_id') ?? null, target, documentId]);
+  }
+  async fetchInvoiceTemplateDocument(documentId) {
+    const response = await this.request.get(`/document:get?filterByTk=${encodeURIComponent(documentId)}`, {}, {
+      isNocobase: true,
+      prefix: false,
+      headers: {
+        'x-data-source': 'pisell2'
+      },
+      customToast: () => {}
+    });
+    const document = response?.data;
+    if (!document || resolveInvoiceDocumentId(document.id) !== documentId) {
+      throw new Error(`Invoice Document ${documentId} 返回的 ID 不匹配`);
+    }
+    if (document.deleted_at !== null && document.deleted_at !== undefined) {
+      throw new Error(`Invoice Document ${documentId} 已被删除`);
+    }
+    if (!isRecord(document.data) || !isRecord(document.data.template_settings)) {
+      throw new Error(`Invoice Document ${documentId} 缺少 template_settings`);
+    }
+    return (0, _utils.normalizeRawInvoiceTemplateSettings)(document.data.template_settings);
+  }
+  logInvoiceTemplateDocumentFallback(error, target, documentId) {
+    console.warn('[OpenDataModule] Invoice Document 加载失败，使用 DEFAULT', {
+      target,
+      documentId,
+      message: error instanceof Error ? error.message : String(error)
+    });
   }
   getLastFetchedAt() {
     return this.store.lastFetchedAt ?? null;
@@ -162,8 +315,15 @@ class OpenDataModule extends _BaseModule.BaseModule {
   /** 清除内存与 sessionStorage 镜像中的 OpenData，供宿主切店时调用。 */
   clearCache() {
     this.fetchRevision += 1;
+    this.invoiceTemplateCacheRevision += 1;
+    this.invoiceTemplateDocumentCache.clear();
+    this.invoiceTemplateDocumentInFlight.clear();
     this.store.data = null;
     this.store.lastFetchedAt = null;
+    this.store.invoiceTemplateSettings = null;
+    this.store.invoiceTemplateTarget = null;
+    this.store.invoiceTemplateDocumentId = null;
+    this.store.invoiceTemplateCacheKey = null;
   }
   checkAvailability(scheduleModule) {
     const scheduleList = scheduleModule ? scheduleModule?.getScheduleListByIds(this.store.data?.['availability.operating_hours'] || []) : undefined;

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

@@ -32,6 +32,15 @@ export interface InvoiceTemplateSettings {
     modules: InvoiceTemplateModuleConfig[];
     [key: string]: unknown;
 }
+export interface InvoiceDocumentResponse {
+    data?: {
+        id?: number | string;
+        deleted_at?: string | null;
+        data?: {
+            template_settings?: unknown;
+        };
+    };
+}
 export type RawInvoiceEditConfig = string | {
     language?: unknown;
     modules?: unknown;
@@ -79,7 +88,7 @@ export interface OpenDataConfig {
         label: string;
         value: number;
     }>;
-    'documents.invoice_template'?: string;
+    'documents.invoice_template'?: string | number;
     'documents.invoice_edit'?: RawInvoiceEditConfig;
     /** @deprecated 仅保留旧调用方的类型兼容，Invoice 读取逻辑不再消费该字段。 */
     'documents.invoice'?: RawInvoiceLayoutConfig;
@@ -92,6 +101,10 @@ export interface OpenDataConfig {
 export interface OpenDataState {
     data: OpenDataConfig | null;
     lastFetchedAt: number | null;
+    invoiceTemplateSettings?: InvoiceTemplateSettings | null;
+    invoiceTemplateTarget?: string | null;
+    invoiceTemplateDocumentId?: string | null;
+    invoiceTemplateCacheKey?: string | null;
 }
 export interface OpenDataFetchParams {
     scope: string;

package/lib/modules/OpenData/utils.d.ts

@@ -14,6 +14,7 @@ export declare function normalizeRawInvoiceTemplateSettings(value: unknown): Inv
  * 从 OpenData Documents section 的两个扁平字段中构造 Native Invoice 配置。
  */
 export declare function normalizeInvoiceTemplateSettings(config: OpenDataConfig | null | undefined): InvoiceTemplateSettings;
+export declare function normalizeInvoiceLayoutFromTemplateSettings(settings: InvoiceTemplateSettings | null | undefined): InvoiceLayoutConfig;
 /**
  * 将 invoice_edit.modules 原样投影为 Web Invoice 使用的 module 字段。
  */

package/lib/modules/OpenData/utils.js

@@ -7,6 +7,7 @@ exports.computeAvailability = computeAvailability;
 exports.getDefaultInvoiceLayoutConfig = getDefaultInvoiceLayoutConfig;
 exports.getDefaultInvoiceTemplateSettings = getDefaultInvoiceTemplateSettings;
 exports.normalizeInvoiceLayoutConfig = normalizeInvoiceLayoutConfig;
+exports.normalizeInvoiceLayoutFromTemplateSettings = normalizeInvoiceLayoutFromTemplateSettings;
 exports.normalizeInvoiceTemplateSettings = normalizeInvoiceTemplateSettings;
 exports.normalizeRawInvoiceTemplateSettings = normalizeRawInvoiceTemplateSettings;
 exports.resolveInvoiceReceiptLocales = resolveInvoiceReceiptLocales;
@@ -118,16 +119,19 @@ function normalizeInvoiceTemplateSettings(config) {
     template: normalizeInvoiceTemplate(config?.['documents.invoice_template'])
   });
 }
+function normalizeInvoiceLayoutFromTemplateSettings(settings) {
+  const modules = normalizeRawInvoiceTemplateSettings(settings).modules;
+  if (modules.length === 0) return getDefaultInvoiceLayoutConfig();
+  return {
+    module: modules
+  };
+}
 
 /**
  * 将 invoice_edit.modules 原样投影为 Web Invoice 使用的 module 字段。
  */
 function normalizeInvoiceLayoutConfig(config) {
-  const modules = normalizeInvoiceTemplateSettings(config).modules;
-  if (modules.length === 0) return getDefaultInvoiceLayoutConfig();
-  return {
-    module: modules
-  };
+  return normalizeInvoiceLayoutFromTemplateSettings(normalizeInvoiceTemplateSettings(config));
 }
 function toBoolean(value) {
   if (typeof value === 'boolean') return value;

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

@@ -415,6 +415,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * if (pending) await pending;
      */
     private appendProductLineToTempOrder;
+    /**
+     * booking 数量拆行时，若 Holder 数量与拆行数严格一致，则按下标分配。
+     * 数量不一致时保持旧数据，避免猜测 Holder 与商品份数的对应关系。
+     */
+    private createSplitBookingLine;
     /**
      * 添加商品行。带 booking 时强制独立行；num>1 时拆成多条 num=1 的 product+booking（对齐 BookingByStep / ticketBooking addService）。
      *
@@ -528,7 +533,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;