@pisell/pisellos 0.10.32 → 0.10.33

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

@@ -33,7 +33,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;
     getInvoiceTemplateSettings(): InvoiceTemplateSettings;
-    ensureInvoiceTemplateSettings(target: string): Promise<InvoiceTemplateSettings>;
+    ensureInvoiceTemplateSettings(target: string, openDataConfig?: OpenDataConfig): Promise<InvoiceTemplateSettings>;
     private commitInvoiceTemplateSettings;
     private resolveInvoiceTemplateSettings;
     private buildInvoiceTemplateCacheKey;

package/lib/modules/OpenData/index.js

@@ -211,8 +211,16 @@ class OpenDataModule extends _BaseModule.BaseModule {
     }
     return (0, _utils.getDefaultInvoiceTemplateSettings)();
   }
-  async ensureInvoiceTemplateSettings(target) {
+  async ensureInvoiceTemplateSettings(target, openDataConfig) {
     const normalizedTarget = String(target || '').trim();
+    if (openDataConfig && openDataConfig !== this.store.data) {
+      // 部分解决方案会在初始化参数中直接收到已经拉取完成的 OpenData。
+      // 将它纳入模块状态后再解析 Document，避免为了 Invoice 重复请求 setting，
+      // 同时让后续同步 getter 能校验同一份 document id 与 target。
+      this.fetchRevision += 1;
+      this.store.data = openDataConfig;
+      this.store.lastFetchedAt = Date.now();
+    }
     const config = this.store.data;
     if (!normalizedTarget || !config) {
       return (0, _utils.getDefaultInvoiceTemplateSettings)();

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

@@ -535,7 +535,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: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/server/utils/small-ticket.d.ts

@@ -33,9 +33,12 @@ export interface SmallTicketProduct {
     product_title: string;
     product_quantity: number;
     selling_price: string;
+    total_selling_price: string;
     original_price: string;
-    base_price?: string;
+    base_price: string;
     total_original_price: string;
+    options_total_price?: string;
+    package_items_total_price?: string;
     extension_list: any[];
     product_uid?: string | number;
     booking_uid?: string | number;
@@ -44,6 +47,7 @@ export interface SmallTicketProduct {
         name: string;
         num?: number;
         price?: string;
+        total_price: string;
         value?: string;
     }>;
     variant?: string;

package/lib/server/utils/small-ticket.js

@@ -269,9 +269,7 @@ function buildBaseData(params) {
     payment_status: financials.paymentStatus,
     total_amount: formatMoney(financials.totalAmount, currencySymbol),
     has_pay: formatMoney(financials.netPaymentApplied, currencySymbol),
-    ...(isPresentId(financials.amountGap) ? {
-      amount_gap: formatMoney(financials.amountGap, currencySymbol)
-    } : {}),
+    amount_gap: formatCalculatedMoney(financials.amountGap ?? 0, currencySymbol),
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || order.metadata?.buzzer),
     order_no: orderNumber,
@@ -323,15 +321,21 @@ function buildProducts(order, locale, productMap) {
     });
     const productNote = resolveProductNote(product, locale);
     const basePrice = resolveProductBasePrice(product);
+    const resolvedCombinations = Array.isArray(product.combinations) && product.combinations.length ? normalizeExistingCombinations(product.combinations, locale, currencySymbol) : combinations;
     return {
       product_title: productTitle,
       product_quantity: quantity,
       selling_price: formatMoney(sellingPrice, currencySymbol),
+      total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(sellingPrice)).mul(quantity), currencySymbol),
       original_price: formatMoney(originalPrice, currencySymbol),
-      ...(isPresentId(basePrice) ? {
-        base_price: formatMoney(basePrice, currencySymbol)
-      } : {}),
+      base_price: formatCalculatedMoney(basePrice ?? 0, currencySymbol),
       total_original_price: formatMoney(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
+      ...(options.length ? {
+        options_total_price: sumNormalizedOptionTotals(options, currencySymbol)
+      } : {}),
+      ...(resolvedCombinations.length ? {
+        package_items_total_price: sumCombinationTotals(resolvedCombinations, currencySymbol)
+      } : {}),
       extension_list: extensionList,
       ...(isPresentId(productUid) ? {
         product_uid: productUid
@@ -348,10 +352,8 @@ function buildProducts(order, locale, productMap) {
       ...(resolvedVariant ? {
         variant: resolvedVariant
       } : {}),
-      ...(Array.isArray(product.combinations) && product.combinations.length ? {
-        combinations: normalizeExistingCombinations(product.combinations, locale)
-      } : combinations.length ? {
-        combinations
+      ...(resolvedCombinations.length ? {
+        combinations: resolvedCombinations
       } : {})
     };
   });
@@ -491,6 +493,7 @@ function normalizeProductOptions(params) {
   const rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray(product.product_sku?.option) ? product.product_sku.option : [];
   return rawOptions.map(option => {
     const price = option.original_price ?? option.add_price ?? option.price;
+    const quantity = toNumber(option.num ?? option.quantity ?? 1, 1);
     const value = option.value ?? option.option ?? option.item;
     const name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option,
@@ -500,11 +503,12 @@ function normalizeProductOptions(params) {
     return {
       name,
       ...(option.num !== undefined || option.quantity !== undefined ? {
-        num: toNumber(option.num ?? option.quantity, 1)
+        num: quantity
       } : {}),
       ...(price !== undefined && price !== null && price !== '' ? {
         price: formatMoney(price, currencySymbol)
       } : {}),
+      total_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(price ?? 0)).mul(quantity), currencySymbol),
       ...(value !== undefined && value !== null && value !== '' ? {
         value: getLocalizedValue(value, locale)
       } : {})
@@ -535,12 +539,25 @@ function normalizeProductCombinations(params) {
       parentProduct
     });
     const productNote = resolveProductNote(bundle, locale);
-    const nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale) : [];
+    const nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale, currencySymbol) : [];
+    const quantity = toNumber(bundle.num ?? bundle.quantity ?? 1, 1);
+    const formattedPrice = formatBundlePrice(bundle, currencySymbol);
+    const optionsTotal = sumNormalizedOptionTotals(combinationsOptions, currencySymbol);
+    const explicitBasePrice = firstPresentValue(bundle.base_price, bundle.metadata?.source_product_price);
+    const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
     return {
       product_title: baseTitle,
-      product_quantity: toNumber(bundle.num ?? bundle.quantity ?? 1, 1),
-      price: formatBundlePrice(bundle, currencySymbol),
+      product_quantity: quantity,
+      price: formattedPrice,
+      total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(formattedPrice)).mul(quantity), currencySymbol),
+      base_price: formatCalculatedMoney(basePrice, currencySymbol),
       combinations_options: combinationsOptions,
+      ...(combinationsOptions.length ? {
+        options_total_price: optionsTotal
+      } : {}),
+      ...(nestedCombinations.length ? {
+        package_items_total_price: sumCombinationTotals(nestedCombinations, currencySymbol)
+      } : {}),
       ...(productNote ? {
         product_note: productNote
       } : {}),
@@ -550,29 +567,65 @@ function normalizeProductCombinations(params) {
     };
   });
 }
-function normalizeExistingCombinations(combinations, locale) {
+function normalizeExistingCombinations(combinations, locale, currencySymbol) {
   return combinations.map(combination => {
     if (!combination || typeof combination !== 'object' || Array.isArray(combination)) {
       return combination;
     }
     const productNote = resolveProductNote(combination, locale);
-    const nestedCombinations = Array.isArray(combination.combinations) ? normalizeExistingCombinations(combination.combinations, locale) : undefined;
+    const rawOptions = Array.isArray(combination.combinations_options) ? combination.combinations_options : Array.isArray(combination.options) ? combination.options : [];
+    const normalizedOptions = normalizeProductOptions({
+      product: {},
+      locale,
+      currencySymbol,
+      options: rawOptions
+    });
+    const nestedCombinations = Array.isArray(combination.combinations) ? normalizeExistingCombinations(combination.combinations, locale, currencySymbol) : [];
     const snapshot = {
       ...combination
     };
     delete snapshot.product_note;
     delete snapshot.note;
+    delete snapshot.combinations;
+    const quantity = toNumber(combination.product_quantity ?? combination.num ?? combination.quantity ?? 1, 1);
+    const unitPrice = firstPresentValue(combination.selling_price, combination.price, combination.original_price) ?? 0;
+    const optionsAmount = sumMoneyValues(normalizedOptions.map(option => option.total_price));
+    const explicitBasePrice = firstPresentValue(combination.base_price);
+    const basePrice = isPresentId(explicitBasePrice) ? explicitBasePrice : 0;
     return {
       ...snapshot,
+      product_quantity: quantity,
+      total_selling_price: formatCalculatedMoney(new _decimal.default(toMoneyNumber(unitPrice)).mul(quantity), currencySymbol),
+      base_price: formatCalculatedMoney(basePrice, currencySymbol),
+      ...(Array.isArray(combination.combinations_options) ? {
+        combinations_options: normalizedOptions
+      } : Array.isArray(combination.options) ? {
+        options: normalizedOptions
+      } : {}),
+      ...(normalizedOptions.length ? {
+        options_total_price: formatCalculatedMoney(optionsAmount, currencySymbol)
+      } : {}),
+      ...(nestedCombinations.length ? {
+        package_items_total_price: sumCombinationTotals(nestedCombinations, currencySymbol)
+      } : {}),
       ...(productNote ? {
         product_note: productNote
       } : {}),
-      ...(nestedCombinations ? {
+      ...(nestedCombinations.length ? {
         combinations: nestedCombinations
       } : {})
     };
   });
 }
+function sumMoneyValues(values) {
+  return values.reduce((sum, value) => sum.plus(toMoneyNumber(value)), new _decimal.default(0));
+}
+function sumNormalizedOptionTotals(options, currencySymbol) {
+  return formatCalculatedMoney(sumMoneyValues(options.map(option => option.total_price)), currencySymbol);
+}
+function sumCombinationTotals(combinations, currencySymbol) {
+  return formatCalculatedMoney(sumMoneyValues(combinations.map(combination => combination.total_selling_price)), currencySymbol);
+}
 function resolveProductNote(product, locale) {
   const productNote = getLocalizedValue(product.product_note, locale).trim();
   if (productNote) return productNote;
@@ -819,12 +872,14 @@ function buildFees(params) {
   const productExpectAmount = firstPresentValue(summary.product_expect_amount, summary.product_amount, order.product_expect_amount);
   const productOriginalAmount = firstPresentValue(summary.product_original_amount, order.product_original_amount) ?? calculateProductOriginalAmount(order);
   const totalSavingsAmount = new _decimal.default(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
+  const itemDiscountAmount = new _decimal.default(toMoneyNumber(productExpectAmount ?? 0)).minus(toMoneyNumber(productOriginalAmount));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(firstPresentValue(summary.total_amount, order.total_amount) ?? 0, currencySymbol),
       original_item_amount: formatMoney(productOriginalAmount, currencySymbol),
       product_expect_amount: formatMoney(productExpectAmount ?? 0, currencySymbol),
+      item_discount_amount: formatCalculatedMoney(itemDiscountAmount, currencySymbol),
       expect_amount: formatMoney(financials.totalAmount, currencySymbol),
       product_quantity: toNumber(firstPresentValue(summary.product_quantity, products.reduce((sum, product) => sum + product.product_quantity, 0)), 0),
       has_pay: formatMoney(financials.orderPaidAmount, currencySymbol),
@@ -1449,6 +1504,11 @@ function formatMoney(value, currencySymbol) {
   const amount = new _decimal.default(toMoneyNumber(value));
   return `${currencySymbol}${amount.toFixed(2)}`;
 }
+function formatCalculatedMoney(value, currencySymbol) {
+  const amount = new _decimal.default(toMoneyNumber(value));
+  const sign = amount.isNegative() ? '-' : '';
+  return `${sign}${currencySymbol}${amount.abs().toFixed(2)}`;
+}
 function formatNegativeMoney(value, currencySymbol) {
   const amount = new _decimal.default(toMoneyNumber(value)).abs();
   return `-${currencySymbol}${amount.toFixed(2)}`;

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

@@ -45,6 +45,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected createSubModule(moduleName: string): Module | null;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    private getInjectedOpenDataConfig;
+    /**
+     * 在解决方案对外 ready 前准备 Invoice Document；失败只降级模板，不阻断销售。
+     * 已由页面取得的 OpenData 直接交给模块接管，没有注入数据时再走 target-scoped 加载。
+     */
+    private prepareInvoiceTemplateAtSolutionReady;
     protected getBookingTicketBusinessCode(): string | null;
     private getIdGeneratorPlugin;
     private loadOpenDataConfig;

package/lib/solution/BookingTicket/index.js

@@ -193,10 +193,37 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       throw new Error('bookingTicket解决方案需要 request 插件支持');
     }
     this.platform = this.otherParams?.platform;
+    await this.prepareInvoiceTemplateAtSolutionReady(this.getInjectedOpenDataConfig());
     await this.configureIdGeneratorFromOpenData();
   }
+  getInjectedOpenDataConfig() {
+    const openData = this.otherParams?.openData;
+    return openData && typeof openData === 'object' && !Array.isArray(openData) ? openData : undefined;
+  }
+
+  /**
+   * 在解决方案对外 ready 前准备 Invoice Document；失败只降级模板，不阻断销售。
+   * 已由页面取得的 OpenData 直接交给模块接管，没有注入数据时再走 target-scoped 加载。
+   */
+  async prepareInvoiceTemplateAtSolutionReady(injectedOpenData) {
+    const businessCode = this.getBookingTicketBusinessCode();
+    if (!businessCode || !this.store.openData) return;
+    const channel = this.getSubmitOrderSalesChannel();
+    const target = `${businessCode}+${channel}`;
+    try {
+      if (injectedOpenData && typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
+        this.openDataTarget = target;
+        await this.store.openData.ensureInvoiceTemplateSettings(target, injectedOpenData);
+        this.otherParams.openData = injectedOpenData;
+        return;
+      }
+      await this.loadOpenDataConfig();
+    } catch (error) {
+      console.warn('[BookingTicket] Invoice 模板预加载失败，使用默认配置', error);
+    }
+  }
   getBookingTicketBusinessCode() {
-    const candidates = [this.otherParams?.businessCode, this.otherParams?.business_code, this.getOrderHeader()?.business_code, this.store.order?.getTempOrder()?.business_code, this.getSalesOrder()?.raw?.business_code];
+    const candidates = [this.otherParams?.businessCode, this.otherParams?.business_code, this.getOrderHeader()?.business_code, typeof this.store.order?.getTempOrder === 'function' ? this.store.order.getTempOrder()?.business_code : undefined, this.getSalesOrder()?.raw?.business_code];
     for (const candidate of candidates) {
       if (candidate === undefined || candidate === null) continue;
       const normalized = String(candidate).trim();
@@ -1784,10 +1811,12 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     await super.setOtherParams(params, {
       cover
     });
+    const invoiceContextChanged = params?.businessCode !== undefined || params?.business_code !== undefined || params?.channel !== undefined || params?.platform !== undefined || Object.prototype.hasOwnProperty.call(params, 'openData');
+    if (invoiceContextChanged) {
+      await this.prepareInvoiceTemplateAtSolutionReady(Object.prototype.hasOwnProperty.call(params, 'openData') ? this.getInjectedOpenDataConfig() : undefined);
+    }
     if (params?.businessCode !== undefined || params?.business_code !== undefined) {
       await this.configureIdGeneratorFromOpenData();
-    } else if (params?.channel !== undefined) {
-      await this.loadOpenDataConfig();
     }
   }
   getDeviceTaskPlugin() {

package/package.json

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