@pisell/pisellos 0.10.19 → 0.10.21

package/dist/solution/UnifiedBookingSales/index.js

@@ -1937,29 +1937,36 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               cachedData = this.store.openData.getOpenData();
               lastFetchedAt = this.store.openData.getLastFetchedAt();
               if (!(!params.force && this.openDataTarget === target && cachedData && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL)) {
-                _context11.next = 11;
+                _context11.next = 14;
                 break;
               }
+              if (!(typeof this.store.openData.ensureInvoiceTemplateSettings === 'function')) {
+                _context11.next = 13;
+                break;
+              }
+              _context11.next = 13;
+              return this.store.openData.ensureInvoiceTemplateSettings(target);
+            case 13:
               return _context11.abrupt("return", cachedData);
-            case 11:
+            case 14:
               if (!this.loadOpenDataInFlight) {
-                _context11.next = 19;
+                _context11.next = 22;
                 break;
               }
               if (!(this.loadOpenDataInFlightTarget === target)) {
-                _context11.next = 16;
+                _context11.next = 19;
                 break;
               }
-              _context11.next = 15;
-              return this.loadOpenDataInFlight;
-            case 15:
-              return _context11.abrupt("return", _context11.sent);
-            case 16:
               _context11.next = 18;
               return this.loadOpenDataInFlight;
             case 18:
-              return _context11.abrupt("return", this.loadOpenData(params));
+              return _context11.abrupt("return", _context11.sent);
             case 19:
+              _context11.next = 21;
+              return this.loadOpenDataInFlight;
+            case 21:
+              return _context11.abrupt("return", this.loadOpenData(params));
+            case 22:
               this.loadOpenDataInFlightTarget = target;
               request = this.store.openData.fetchOpenData({
                 scope: 'board',
@@ -1967,10 +1974,10 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 section_code: [].concat(OPEN_DATA_SECTION_CODES)
               });
               this.loadOpenDataInFlight = request;
-              _context11.prev = 22;
-              _context11.next = 25;
+              _context11.prev = 25;
+              _context11.next = 28;
               return request;
-            case 25:
+            case 28:
               openData = _context11.sent;
               if (this.loadOpenDataInFlight === request) {
                 this.openDataTarget = target;
@@ -1979,18 +1986,18 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 this.otherParams.channel = channel;
               }
               return _context11.abrupt("return", openData);
-            case 28:
-              _context11.prev = 28;
+            case 31:
+              _context11.prev = 31;
               if (this.loadOpenDataInFlight === request) {
                 this.loadOpenDataInFlight = null;
                 this.loadOpenDataInFlightTarget = null;
               }
-              return _context11.finish(28);
-            case 31:
+              return _context11.finish(31);
+            case 34:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[22,, 28, 31]]);
+        }, _callee11, this, [[25,, 31, 34]]);
       }));
       function loadOpenData(_x7) {
         return _loadOpenData.apply(this, arguments);

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, } 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,8 +9,10 @@ var _exportNames = {
   getDefaultInvoiceLayoutConfig: true,
   getDefaultInvoiceTemplateSettings: true,
   normalizeInvoiceLayoutConfig: true,
+  normalizeInvoiceLayoutFromTemplateSettings: true,
   normalizeInvoiceTemplateSettings: true,
-  normalizeRawInvoiceTemplateSettings: true
+  normalizeRawInvoiceTemplateSettings: true,
+  resolveInvoiceReceiptLocales: true
 };
 exports.OpenDataModule = void 0;
 Object.defineProperty(exports, "computeAvailability", {
@@ -37,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 () {
@@ -49,6 +57,12 @@ Object.defineProperty(exports, "normalizeRawInvoiceTemplateSettings", {
     return _utils.normalizeRawInvoiceTemplateSettings;
   }
 });
+Object.defineProperty(exports, "resolveInvoiceReceiptLocales", {
+  enumerable: true,
+  get: function () {
+    return _utils.resolveInvoiceReceiptLocales;
+  }
+});
 var _BaseModule = require("../BaseModule");
 var _utils = require("./utils");
 var _types = require("./types");
@@ -63,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';
@@ -75,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);
   }
@@ -83,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;
@@ -132,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;
   }
@@ -143,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;
@@ -155,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

@@ -1,6 +1,11 @@
 import type { OpenDataConfig, OpenDataAvailabilityResult, ComputeAvailabilityParams, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export declare function getDefaultInvoiceLayoutConfig(): InvoiceLayoutConfig;
 export declare function getDefaultInvoiceTemplateSettings(): InvoiceTemplateSettings;
+/**
+ * 将非 DEFAULT Invoice 模板启用的语言转换为 small_ticket_data locale。
+ * cn_en 是中英组合打印模式，因此展开为 en 与 zh_CN 两份数据。
+ */
+export declare function resolveInvoiceReceiptLocales(settings?: InvoiceTemplateSettings | null): string[];
 /**
  * 规范化已经提取出的公开 template_settings 值，供打印入口复用。
  */
@@ -9,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,8 +7,10 @@ exports.computeAvailability = computeAvailability;
 exports.getDefaultInvoiceLayoutConfig = getDefaultInvoiceLayoutConfig;
 exports.getDefaultInvoiceTemplateSettings = getDefaultInvoiceTemplateSettings;
 exports.normalizeInvoiceLayoutConfig = normalizeInvoiceLayoutConfig;
+exports.normalizeInvoiceLayoutFromTemplateSettings = normalizeInvoiceLayoutFromTemplateSettings;
 exports.normalizeInvoiceTemplateSettings = normalizeInvoiceTemplateSettings;
 exports.normalizeRawInvoiceTemplateSettings = normalizeRawInvoiceTemplateSettings;
+exports.resolveInvoiceReceiptLocales = resolveInvoiceReceiptLocales;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
 var _types = require("./types");
@@ -42,6 +44,36 @@ function getDefaultInvoiceTemplateSettings() {
     modules: []
   };
 }
+const INVOICE_RECEIPT_LOCALE_ORDER = ['en', 'zh_CN', 'zh_HK', 'ja', 'pt'];
+const INVOICE_RECEIPT_LOCALE_MAPPING = {
+  en: ['en'],
+  zh_cn: ['zh_CN'],
+  zh_hk: ['zh_HK'],
+  ja: ['ja'],
+  pt: ['pt'],
+  cn_en: ['en', 'zh_CN']
+};
+
+/**
+ * 将非 DEFAULT Invoice 模板启用的语言转换为 small_ticket_data locale。
+ * cn_en 是中英组合打印模式，因此展开为 en 与 zh_CN 两份数据。
+ */
+function resolveInvoiceReceiptLocales(settings) {
+  if (typeof settings?.template !== 'string' || settings.template.trim().length === 0 || settings.template.trim().toUpperCase() === 'DEFAULT' || !isRecord(settings.language)) {
+    return [];
+  }
+  const enabledLocales = new Set();
+  Object.entries(settings.language).forEach(([rawKey, count]) => {
+    if (typeof count !== 'number' || !Number.isFinite(count) || count <= 0) {
+      return;
+    }
+    const key = rawKey.trim().toLowerCase().replace(/-/g, '_');
+    INVOICE_RECEIPT_LOCALE_MAPPING[key]?.forEach(locale => {
+      enabledLocales.add(locale);
+    });
+  });
+  return INVOICE_RECEIPT_LOCALE_ORDER.filter(locale => enabledLocales.has(locale));
+}
 function normalizeInvoiceTemplate(value) {
   if (typeof value !== 'string' || value.trim().length === 0) return 'DEFAULT';
   return value.trim().toUpperCase() === 'DEFAULT' ? 'DEFAULT' : value;
@@ -87,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

@@ -528,7 +528,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;

package/lib/plugins/request.d.ts

@@ -69,6 +69,7 @@ export interface RequestOptions {
     customToast?: () => void;
     cache?: CacheProps;
     osServer?: boolean;
+    isNocobase?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
@@ -124,7 +125,7 @@ declare class RequestPluginImpl implements RequestPlugin {
     /**
      * GET 请求
      */
-    get<T = any>(url: string, options?: RequestOptions): Promise<T>;
+    get<T = any>(url: string, dataOrOptions?: any, options?: RequestOptions): Promise<T>;
     /**
      * POST 请求
      */

package/lib/plugins/request.js

@@ -99,9 +99,10 @@ class RequestPluginImpl {
   /**
    * GET 请求
    */
-  get(url, options = {}) {
+  get(url, dataOrOptions = {}, options) {
+    const requestOptions = options ?? dataOrOptions;
     return this.request({
-      ...options,
+      ...requestOptions,
       url,
       method: 'GET'
     });

package/lib/server/index.d.ts

@@ -532,6 +532,11 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Checkout 与本地小票必须消费同一份规范化子项快照。
+     * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+     */
+    private normalizeCheckoutCollections;
     /**
      * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
      */

package/lib/server/index.js

@@ -27,6 +27,7 @@ var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
+var _orderCollectionIdentity = require("../modules/Order/utils/orderCollectionIdentity");
 var _OpenData = require("../modules/OpenData");
 var _modules = require("./modules");
 Object.keys(_modules).forEach(function (key) {
@@ -631,7 +632,7 @@ class Server {
     } = params;
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
+    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
     const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
     if (!this.app?.request?.post) {
       throw new Error('app.request 不可用');
@@ -3725,7 +3726,8 @@ class Server {
       };
     }
     const printableOrder = await this.withLocalSmallTicketData(params.order, {
-      requireFullyPaid: params.requireFullyPaid
+      requireFullyPaid: params.requireFullyPaid,
+      invoiceTemplateSettings: params.invoiceTemplateSettings
     });
     if (!(0, _smallTicket.hasSmallTicketData)(printableOrder.payment_info?.small_ticket_data)) {
       return {
@@ -4114,12 +4116,13 @@ class Server {
     }
     const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.applyCheckoutFulfillmentBuzzer(numberedData, title);
+    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
       backendPath,
       data: checkoutData,
       title,
-      reason: 'checkout 已转入设备任务同步'
+      reason: 'checkout 已转入设备任务同步',
+      invoiceTemplateSettings
     });
     if (pendingResult?.status === true) {
       const pendingOrder = pendingResult.data;
@@ -4298,9 +4301,10 @@ class Server {
       backendPath,
       data,
       title,
-      reason
+      reason,
+      invoiceTemplateSettings
     } = params;
-    const pendingOrder = await this.buildPendingSyncCheckoutOrder(data);
+    const pendingOrder = await this.buildPendingSyncCheckoutOrder(data, invoiceTemplateSettings);
     if (!pendingOrder) {
       this.logError(`${title}: checkout 失败且订单缺少本地存储标识`, {
         backendPath,
@@ -4366,23 +4370,39 @@ class Server {
       };
     }
   }
-  async buildPendingSyncCheckoutOrder(data) {
+  async buildPendingSyncCheckoutOrder(data, invoiceTemplateSettings) {
     if (!data || typeof data !== 'object') return null;
     const hasStorageKey = data.external_sale_number !== undefined && data.external_sale_number !== null && data.external_sale_number !== '' ? true : data.order_id !== undefined && data.order_id !== null && data.order_id !== '';
     if (!hasStorageKey) return null;
-    const pendingOrder = {
+    const pendingOrder = this.normalizeCheckoutCollections({
       ...data,
       need_sync: 1,
       is_draft_order: 0
-    };
+    });
     const productMap = await this.buildSmallTicketProductMap(pendingOrder);
     const orderWithProductTitles = this.withPendingSyncProductTitles(pendingOrder, productMap);
     return this.withLocalSmallTicketData(orderWithProductTitles, {
       requireFullyPaid: true,
-      productMap
+      productMap,
+      invoiceTemplateSettings
     });
   }
 
+  /**
+   * Checkout 与本地小票必须消费同一份规范化子项快照。
+   * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+   */
+  normalizeCheckoutCollections(data) {
+    if (!data || typeof data !== 'object' || Array.isArray(data)) return data;
+    const normalized = (0, _orderCollectionIdentity.normalizeOrderCollections)(data, {
+      ensureUid: false
+    }).order;
+    if (Array.isArray(normalized.payments)) {
+      normalized.payments = (0, _paymentUtils.mergeOrderPaymentListsByIdentity)([], normalized.payments);
+    }
+    return normalized;
+  }
+
   /**
    * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
    */
@@ -4700,11 +4720,27 @@ class Server {
     if (!this.shouldBuildSmallTicketData(order)) return order;
     if (options?.requireFullyPaid && !this.isSalesOrderFullyPaid(order)) return order;
     try {
-      const enrichedOrder = await this.enrichPaymentNamesByCode(order);
+      const normalizedCollections = (0, _orderCollectionIdentity.normalizeOrderCollections)(order, {
+        ensureUid: false
+      });
+      const normalizedOrder = normalizedCollections.order;
+      const collapsedDuplicateCounts = {
+        products: normalizedCollections.stats.product.collapsedDuplicateCount,
+        bookings: normalizedCollections.stats.booking.collapsedDuplicateCount,
+        payments: normalizedCollections.stats.payment.collapsedDuplicateCount
+      };
+      if (Object.values(collapsedDuplicateCounts).some(count => count > 0)) {
+        this.logWarning('withLocalSmallTicketData: 折叠重复订单子项', {
+          order_identifier: normalizedOrder.order_id ?? normalizedOrder.external_sale_number ?? normalizedOrder.shop_order_number ?? null,
+          collapsed_duplicate_counts: collapsedDuplicateCounts
+        });
+      }
+      const enrichedOrder = await this.enrichPaymentNamesByCode(normalizedOrder);
       const productMap = options?.productMap ?? (await this.buildSmallTicketProductMap(enrichedOrder));
       const smallTicketData = (0, _smallTicket.buildSmallTicketData)({
         order: enrichedOrder,
         shopInfo: this.getSmallTicketShopInfo(),
+        locales: (0, _OpenData.resolveInvoiceReceiptLocales)(options?.invoiceTemplateSettings),
         productMap
       });
       return {