@pisell/pisellos 0.10.20 → 0.10.21

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

@@ -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.js

@@ -4720,7 +4720,22 @@ 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,

package/lib/solution/BaseSales/index.js

@@ -257,6 +257,22 @@ function normalizeBaseSalesRecordCollections(sourceRecord, options) {
   }
   return normalizedRecord;
 }
+function isValidBaseSalesSmallTicketDataSnapshot(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
+  const localeSnapshots = Object.values(value);
+  return localeSnapshots.length > 0 && localeSnapshots.some(localeSnapshot => localeSnapshot !== null && typeof localeSnapshot === 'object' && !Array.isArray(localeSnapshot));
+}
+function mergeBaseSalesSmallTicketDataSnapshot(currentValue, loadedValue) {
+  if (isValidBaseSalesSmallTicketDataSnapshot(loadedValue)) {
+    return (0, _lodashEs.cloneDeep)(loadedValue);
+  }
+  if (isValidBaseSalesSmallTicketDataSnapshot(currentValue)) {
+    return (0, _lodashEs.cloneDeep)(currentValue);
+  }
+  if (loadedValue !== undefined) return (0, _lodashEs.cloneDeep)(loadedValue);
+  if (currentValue !== undefined) return (0, _lodashEs.cloneDeep)(currentValue);
+  return undefined;
+}
 function getBaseSalesMetadataUid(item, metadataKey) {
   const uid = item?.metadata?.[metadataKey] ?? item?.[metadataKey];
   if (uid === undefined || uid === null || uid === '') return null;
@@ -296,6 +312,11 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   });
   const uidRemaps = [];
   const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+    // small_ticket_data 是由 Server 一次性生成的完整展示快照，不能递归进入
+    // locale 内部继续套用订单集合或普通数组的合并规则。
+    if (key === 'small_ticket_data') {
+      return mergeBaseSalesSmallTicketDataSnapshot(currentValue, loadedValue);
+    }
     const collectionKind = getBaseSalesOrderCollectionKind(key);
     if (collectionKind && Array.isArray(loadedValue)) {
       return mergeBaseSalesOrderCollection(collectionKind, Array.isArray(currentValue) ? currentValue : [], loadedValue, strategy, uidRemaps);

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

@@ -339,7 +339,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 客户状态
@@ -458,7 +458,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -221,6 +221,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const lastFetchedAt = this.store.openData.getLastFetchedAt();
     const cachedData = this.store.openData.getOpenData();
     if (cachedData && this.openDataTarget === target && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
+      if (typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
+        await this.store.openData.ensureInvoiceTemplateSettings(target);
+      }
       this.otherParams.openData = cachedData;
       return cachedData;
     }

package/lib/solution/Sales/index.js

@@ -182,6 +182,9 @@ class SalesImpl extends _BaseModule.BaseModule {
     const cachedData = this.invoiceOpenDataModule.getOpenData();
     const lastFetchedAt = this.invoiceOpenDataModule.getLastFetchedAt();
     if (cachedData && this.invoiceOpenDataTarget === target && typeof lastFetchedAt === 'number' && Date.now() - lastFetchedAt < INVOICE_OPEN_DATA_CACHE_TTL) {
+      if (typeof this.invoiceOpenDataModule.ensureInvoiceTemplateSettings === 'function') {
+        await this.invoiceOpenDataModule.ensureInvoiceTemplateSettings(target);
+      }
       return cachedData;
     }
     if (this.invoiceOpenDataInFlight) {

package/lib/solution/UnifiedBookingSales/index.js

@@ -1479,6 +1479,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const cachedData = this.store.openData.getOpenData();
     const lastFetchedAt = this.store.openData.getLastFetchedAt();
     if (!params.force && this.openDataTarget === target && cachedData && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
+      if (typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
+        await this.store.openData.ensureInvoiceTemplateSettings(target);
+      }
       return cachedData;
     }
     if (this.loadOpenDataInFlight) {

package/package.json

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