@pisell/pisellos 0.10.16 → 0.10.18

package/lib/server/modules/order/index.d.ts

@@ -20,6 +20,8 @@ export declare class OrderModule extends BaseModule implements Module {
     private storage;
     private orderSQLiteSaveQueue; /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
     private recentSqliteWriteByStorageKey;
+    /** 最近一次清理过期 SQLite 去重记录的时间，避免每次写入都遍历 Map */
+    private lastRecentSqliteWriteCleanupAtMs;
     /** 最近一次 SSE 全量拉取完成时间 */
     private lastServerFullFetchAtMs;
     constructor(name?: string, version?: string);
@@ -58,6 +60,12 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private mergeAuthoritativeOrderCollection;
     private reconcileOverwriteOrderCollections;
+    /**
+     * 惰性清理已经超过去重窗口的 SQLite 写入记录。
+     *
+     * 清理频率与去重窗口一致，既限制 Map 长期增长，也不会移除仍参与去重的记录。
+     */
+    private cleanupExpiredRecentSqliteWrites;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *

package/lib/server/modules/order/index.js

@@ -56,6 +56,8 @@ class OrderModule extends _BaseModule.BaseModule {
   storage;
   orderSQLiteSaveQueue = Promise.resolve(); /** 按 storageKey 记录最近一次 SQLite 写入来源与时间，用于去重 */
   recentSqliteWriteByStorageKey = new Map();
+  /** 最近一次清理过期 SQLite 去重记录的时间，避免每次写入都遍历 Map */
+  lastRecentSqliteWriteCleanupAtMs = 0;
   /** 最近一次 SSE 全量拉取完成时间 */
   lastServerFullFetchAtMs = 0;
   constructor(name, version) {
@@ -285,6 +287,24 @@ class OrderModule extends _BaseModule.BaseModule {
     return this.normalizeOrderCollectionsForIngress((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(reconciled, uidRemaps), 'overwriteExistingOrder.reconciled');
   }
 
+  /**
+   * 惰性清理已经超过去重窗口的 SQLite 写入记录。
+   *
+   * 清理频率与去重窗口一致，既限制 Map 长期增长，也不会移除仍参与去重的记录。
+   */
+  cleanupExpiredRecentSqliteWrites(now) {
+    const elapsedSinceCleanup = now - this.lastRecentSqliteWriteCleanupAtMs;
+    if (this.lastRecentSqliteWriteCleanupAtMs > 0 && elapsedSinceCleanup >= 0 && elapsedSinceCleanup < ORDER_SQLITE_DEDUPE_MS) {
+      return;
+    }
+    for (const [storageKey, recentWrite] of this.recentSqliteWriteByStorageKey) {
+      if (now - recentWrite.ts >= ORDER_SQLITE_DEDUPE_MS) {
+        this.recentSqliteWriteByStorageKey.delete(storageKey);
+      }
+    }
+    this.lastRecentSqliteWriteCleanupAtMs = now;
+  }
+
   /**
    * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
    *
@@ -293,6 +313,7 @@ class OrderModule extends _BaseModule.BaseModule {
    */
   recordRecentSqliteWrite(source, orders) {
     const now = Date.now();
+    this.cleanupExpiredRecentSqliteWrites(now);
     for (const order of orders) {
       const storageKey = this.getOrderStorageKey(order);
       if (!storageKey) continue;
@@ -1176,6 +1197,8 @@ class OrderModule extends _BaseModule.BaseModule {
     }
     this.isProcessingSyncBatch = false;
     this.pendingSyncMessages = [];
+    this.recentSqliteWriteByStorageKey.clear();
+    this.lastRecentSqliteWriteCleanupAtMs = 0;
     if (this.orderDataSource?.destroy) this.orderDataSource.destroy();
     super.destroy();
   }

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

@@ -35,6 +35,8 @@ export interface SmallTicketProduct {
     original_price: string;
     total_original_price: string;
     extension_list: any[];
+    product_uid?: string | number;
+    booking_uid?: string | number;
     options?: Array<{
         name: string;
         num?: number;
@@ -44,6 +46,11 @@ export interface SmallTicketProduct {
     variant?: string;
     combinations?: any[];
 }
+export interface SmallTicketBookingSnapshot extends Record<string, any> {
+    product_uid?: string | number;
+    booking_uid?: string | number;
+}
+export type SmallTicketAppointment = SmallTicketItem[] | SmallTicketBookingSnapshot[];
 export interface SmallTicketLocaleData {
     base_data: Record<string, any>;
     products: SmallTicketProduct[];
@@ -52,7 +59,7 @@ export interface SmallTicketLocaleData {
         countFee: Record<string, any>;
     };
     customer: SmallTicketItem[];
-    appointment: SmallTicketItem[];
+    appointment: SmallTicketAppointment;
     delivery?: SmallTicketItem[];
     resources: Array<{
         id: string | number;
@@ -61,6 +68,7 @@ export interface SmallTicketLocaleData {
         form_title: string;
     }>;
     payment_data: SmallTicketItem[][];
+    wallets: SmallTicketItem[][];
     tickets: any[];
     source_shop: any[];
     refund_data: any[];

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

@@ -141,6 +141,11 @@ function buildLocaleData(params) {
       locale,
       currencySymbol
     }),
+    wallets: buildWallets({
+      order,
+      locale,
+      currencySymbol
+    }),
     tickets: Array.isArray(order.tickets) ? order.tickets : [],
     source_shop: [],
     refund_data: [],
@@ -161,12 +166,15 @@ function buildBaseData(params) {
     order_number: orderNumber,
     shop_tax_number: stringify(shopInfo.tax_number || order.shop_tax_number),
     shop_phone: stringify(shopInfo.phone || order.shop_phone),
-    shop_address: stringify(shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
+    shop_address: stringify(shopInfo.receipt_address || shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
     original_payment_status: stringify(order.payment_status),
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || order.metadata?.buzzer),
     order_no: orderNumber,
-    order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale)
+    order_time: formatDateTime(order.created_at || order.sales_time || new Date(), locale),
+    ...(isPresentId(order.updated_at) ? {
+      updated_at: formatDateTime(order.updated_at, locale)
+    } : {})
   };
 }
 function buildProducts(order, locale, productMap) {
@@ -200,6 +208,8 @@ function buildProducts(order, locale, productMap) {
       parentProduct,
       locale
     });
+    const productUid = firstPresentValue(product.metadata?.unique_identification_number, product.unique_identification_number);
+    const bookingUid = firstPresentValue(product.booking_uid, product.metadata?.booking_uid);
     const extensionList = buildProductExtensionList({
       product,
       locale,
@@ -214,6 +224,12 @@ function buildProducts(order, locale, productMap) {
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: extensionList,
+      ...(isPresentId(productUid) ? {
+        product_uid: productUid
+      } : {}),
+      ...(isPresentId(bookingUid) ? {
+        booking_uid: bookingUid
+      } : {}),
       ...(options.length ? {
         options
       } : {}),
@@ -579,6 +595,9 @@ function isNonZeroId(value) {
 function isPresentId(value) {
   return value !== undefined && value !== null && value !== '';
 }
+function firstPresentValue(...values) {
+  return values.find(value => isPresentId(value));
+}
 function isSameId(left, right) {
   if (!isPresentId(left) || !isPresentId(right)) return false;
   return String(left) === String(right);
@@ -647,12 +666,13 @@ function buildFees(params) {
     });
   }
   const productExpectAmount = summary.product_expect_amount || summary.product_amount || order.product_expect_amount;
-  const productOriginalAmount = summary.product_original_amount ?? order.product_original_amount ?? productExpectAmount;
+  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));
   return {
     fees,
     countFee: {
       total_amount: formatMoney(summary.total_amount || order.total_amount, currencySymbol),
+      original_item_amount: formatMoney(productOriginalAmount, currencySymbol),
       product_expect_amount: formatMoney(productExpectAmount, currencySymbol),
       expect_amount: formatMoney(summary.expect_amount || order.expect_amount || summary.total_amount || order.total_amount, currencySymbol),
       product_quantity: toNumber(summary.product_quantity || products.reduce((sum, product) => sum + product.product_quantity, 0), 0),
@@ -675,6 +695,13 @@ function buildFees(params) {
     }
   };
 }
+function calculateProductOriginalAmount(order) {
+  return normalizeArray(order.products).reduce((total, product) => {
+    const quantity = toNumber(product.product_quantity ?? product.quantity ?? product.num ?? 1, 1);
+    const originalPrice = product.original_price ?? product.selling_price ?? product.payment_price ?? product.price ?? 0;
+    return total.plus(new _decimal.default(toMoneyNumber(originalPrice)).mul(quantity));
+  }, new _decimal.default(0));
+}
 function buildCustomer(order, locale) {
   return [{
     item: label(locale, 'contactName'),
@@ -712,6 +739,27 @@ function buildDelivery(order, locale) {
   return items;
 }
 function buildAppointment(order, locale) {
+  const bookings = normalizeArray(order.bookings);
+  if (bookings.length) {
+    return bookings.map(booking => {
+      const snapshot = {
+        ...booking
+      };
+      delete snapshot.product_uid;
+      delete snapshot.booking_uid;
+      const productUid = firstPresentValue(booking.product_uid, booking.metadata?.product_uid);
+      const bookingUid = firstPresentValue(booking.metadata?.unique_identification_number, booking.booking_uid);
+      return {
+        ...snapshot,
+        ...(isPresentId(productUid) ? {
+          product_uid: productUid
+        } : {}),
+        ...(isPresentId(bookingUid) ? {
+          booking_uid: bookingUid
+        } : {})
+      };
+    });
+  }
   const tableName = order.table_name || order.metadata?.table_name || order.metadata?.table?.name || order.form_data?.table_name;
   if (!tableName) return [];
   return [{
@@ -729,41 +777,63 @@ function buildResources(order, locale) {
 }
 function buildPaymentData(params) {
   const payments = normalizeArray(params.order.payments);
-  return payments.filter(payment => isPrintablePayment(payment)).map(payment => {
-    const items = [{
-      item: paymentMethodName(payment, params.locale),
-      value: formatMoney(payment.amount ?? payment.origin_amount, params.currencySymbol)
-    }];
-    const fundRecord = getFundRecord(payment);
-    if (fundRecord) {
-      items.push(...buildFundRecordPaymentItems({
-        payment,
-        fundRecord,
-        locale: params.locale,
-        currencySymbol: params.currencySymbol
-      }));
-    } else {
-      const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
-      if (remainingAmount !== undefined && remainingAmount !== null) {
-        items.push({
-          item: label(params.locale, 'remainingAmount'),
-          value: formatMoney(remainingAmount, params.currencySymbol)
-        });
-      }
+  return payments.filter(payment => isPrintablePayment(payment)).map(payment => buildPaymentItems({
+    payment,
+    locale: params.locale,
+    currencySymbol: params.currencySymbol,
+    includeFundRecordBalance: false
+  }));
+}
+function buildWallets(params) {
+  return normalizeArray(params.order.payments).filter(payment => isPrintablePayment(payment) && !!getFundRecord(payment)).map(payment => buildPaymentItems({
+    payment,
+    locale: params.locale,
+    currencySymbol: params.currencySymbol,
+    includeFundRecordBalance: true
+  }));
+}
+function buildPaymentItems(params) {
+  const {
+    payment,
+    locale,
+    currencySymbol,
+    includeFundRecordBalance
+  } = params;
+  const items = [{
+    item: paymentMethodName(payment, locale),
+    value: formatMoney(payment.amount ?? payment.origin_amount, currencySymbol)
+  }];
+  const fundRecord = getFundRecord(payment);
+  if (fundRecord) {
+    items.push(...buildFundRecordPaymentItems({
+      payment,
+      fundRecord,
+      locale,
+      currencySymbol,
+      includeBalance: includeFundRecordBalance
+    }));
+  } else {
+    const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
+    if (remainingAmount !== undefined && remainingAmount !== null) {
+      items.push({
+        item: label(locale, 'remainingAmount'),
+        value: formatMoney(remainingAmount, currencySymbol)
+      });
     }
-    items.push({
-      item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), params.locale),
-      value: ''
-    });
-    return items;
+  }
+  items.push({
+    item: formatDateTime(payment.paid_at || payment.created_at || payment.updated_at || new Date(), locale),
+    value: ''
   });
+  return items;
 }
 function buildFundRecordPaymentItems(params) {
   const {
     payment,
     fundRecord,
     locale,
-    currencySymbol
+    currencySymbol,
+    includeBalance
   } = params;
   const items = [];
   const usingBeforeValue = fundRecord.using_before_value;
@@ -774,13 +844,15 @@ function buildFundRecordPaymentItems(params) {
       item: label(locale, 'redeemPoints'),
       value: trimDecimal(usedPoints)
     });
-    items.push({
-      item: label(locale, 'remainingPoints'),
-      value: trimDecimal(new _decimal.default(toMoneyNumber(usingAfterValue)))
-    });
+    if (includeBalance) {
+      items.push({
+        item: label(locale, 'remainingPoints'),
+        value: trimDecimal(new _decimal.default(toMoneyNumber(usingAfterValue)))
+      });
+    }
     return items;
   }
-  if (usingAfterValue !== undefined && usingAfterValue !== null) {
+  if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
     items.push({
       item: label(locale, 'remainingAmount'),
       value: formatMoney(usingAfterValue, currencySymbol)

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

@@ -136,6 +136,13 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getAuthoritativeBundleUnitPrice;
     private mergeProductForPriceQuery;
     protected getSubmitOrderSalesChannel(): string | undefined;
+    /** Subclasses with target-scoped OpenData override this guard before reusing the cache. */
+    protected isInvoiceOpenDataCacheCurrent(): boolean;
+    private getFulfillmentRefModeConfigs;
+    private getFulfillmentRefMode;
+    private getCachedInvoiceLayoutConfig;
+    private getCachedInvoiceTemplateSettings;
+    private buildSubmitPayloadEnhancerWithOpenDataConfig;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），

package/lib/solution/BaseSales/index.js

@@ -35,6 +35,9 @@ var _transformBaseProductToOrderProduct = require("./utils/transformBaseProductT
 var _quotationPrice = require("./utils/quotationPrice");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SERVER_ORDER_CHANGED_EVENT = 'order:onOrdersChanged';
+const OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
+const OS_INVOICE_LAYOUT_CONFIG_FIELD = '_os_invoice_layout_config';
+const OS_INVOICE_TEMPLATE_SETTINGS_FIELD = '_os_invoice_template_settings';
 const WALLET_PAYMENT_CODE_BY_TAG = {
   product_voucher: 'PRODUCTVOUCHER',
   gift_card: 'GIFTCARD',
@@ -847,6 +850,73 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     return this.otherParams?.channel;
   }
 
+  /** Subclasses with target-scoped OpenData override this guard before reusing the cache. */
+  isInvoiceOpenDataCacheCurrent() {
+    return true;
+  }
+  getFulfillmentRefModeConfigs() {
+    const candidates = [this.otherParams?.openData, this.otherParams?.dineInConfig, this.store?.openData?.getOpenData?.()];
+    return candidates.filter(candidate => candidate && typeof candidate === 'object' && !Array.isArray(candidate));
+  }
+  getFulfillmentRefMode() {
+    for (const config of this.getFulfillmentRefModeConfigs()) {
+      const mode = config['fulfillment.fulfillment_ref_mode'];
+      if (mode === undefined || mode === null) continue;
+      const normalized = String(mode).trim();
+      if (normalized) return normalized;
+    }
+    return undefined;
+  }
+  getCachedInvoiceLayoutConfig() {
+    const openDataModule = this.store?.openData;
+    if (typeof openDataModule?.getInvoiceLayoutConfig !== 'function') return undefined;
+    if (!this.isInvoiceOpenDataCacheCurrent()) return undefined;
+    try {
+      return openDataModule.getInvoiceLayoutConfig();
+    } catch (error) {
+      this.logWarning('读取 Invoice OpenData 布局失败，提交时不注入布局配置', {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return undefined;
+    }
+  }
+  getCachedInvoiceTemplateSettings() {
+    const openDataModule = this.store?.openData;
+    if (typeof openDataModule?.getInvoiceTemplateSettings !== 'function') return undefined;
+    if (!this.isInvoiceOpenDataCacheCurrent()) return undefined;
+    try {
+      return openDataModule.getInvoiceTemplateSettings();
+    } catch (error) {
+      this.logWarning('读取 Invoice OpenData 模板配置失败，提交时不注入模板配置', {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return undefined;
+    }
+  }
+  buildSubmitPayloadEnhancerWithOpenDataConfig(enhancePayload) {
+    const fulfillmentRefMode = this.getFulfillmentRefMode();
+    const invoiceLayoutConfig = this.getCachedInvoiceLayoutConfig();
+    const invoiceTemplateSettings = this.getCachedInvoiceTemplateSettings();
+    if (!fulfillmentRefMode && !invoiceLayoutConfig && !invoiceTemplateSettings) {
+      return enhancePayload;
+    }
+    return (payload, ctx) => {
+      const enhancedPayload = enhancePayload ? enhancePayload(payload, ctx) : payload;
+      return {
+        ...enhancedPayload,
+        ...(fulfillmentRefMode ? {
+          [OS_FULFILLMENT_REF_MODE_FIELD]: fulfillmentRefMode
+        } : {}),
+        ...(invoiceLayoutConfig ? {
+          [OS_INVOICE_LAYOUT_CONFIG_FIELD]: (0, _lodashEs.cloneDeep)(invoiceLayoutConfig)
+        } : {}),
+        ...(invoiceTemplateSettings ? {
+          [OS_INVOICE_TEMPLATE_SETTINGS_FIELD]: (0, _lodashEs.cloneDeep)(invoiceTemplateSettings)
+        } : {})
+      };
+    };
+  }
+
   /**
    * 工厂入口：根据子模块名实例化对应模块。
    * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），
@@ -1442,9 +1512,20 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!params.products.length) return false;
     const hasDraftProduct = params.products.some(product => !this.isPersistedOrderProduct(product));
     if (hasDraftProduct) return false;
-    const hasSelectedDiscount = params.currentDiscountList.some(discount => discount.isSelected || discount.isEditMode || discount.isManualSelect);
-    if (hasSelectedDiscount) return false;
-    return !params.nextDiscountList.some(discount => discount.isSelected || discount.isEditMode || discount.isManualSelect);
+
+    // 编辑详情 hydrate 时，商品行上的历史券卡会被还原为 isEditMode=true、
+    // isSelected=true 的只读记录。它们表示“该折扣已在原订单结算”，不是用户在
+    // 当前编辑会话中新做的选择，不能据此放行刚从 prepare/config 拉回来的折扣。
+    // 否则后续 Rules.calcDiscount 会把没有 isManualSelect 标记的可用 runtime 卡
+    // 当作自动候选，再次写入 tempOrder。这里只识别非 isEditMode 的 runtime 状态；
+    // 新建单、编辑态新增商品以及用户本次明确选择/取消折扣的原有流程保持不变。
+    const hasRuntimeDiscountSelection = params.currentDiscountList.some(discount => !discount.isEditMode && (discount.isSelected || discount.isManualSelect));
+    if (hasRuntimeDiscountSelection) return false;
+
+    // nextDiscountList 已经合并了历史只读折扣与本次获取的 runtime 折扣，
+    // 因此这里同样必须排除 isEditMode；只有 runtime 条目已有明确选择状态时，
+    // 才允许继续进入折扣重算。
+    return !params.nextDiscountList.some(discount => !discount.isEditMode && (discount.isSelected || discount.isManualSelect));
   }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {
     if (!currentDiscountList.length) return discountList;
@@ -1989,6 +2070,26 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     // this.store.order.persistTempOrder();
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
     const smallTicketDataFlag = params?.smallTicketDataFlag ?? this.getDefaultCheckoutSmallTicketDataFlag();
+    const virtualSettlementEnhancePayload = virtualSettlement ? (payload, ctx) => {
+      const callerPayload = params?.enhancePayload ? params.enhancePayload(payload, ctx) : payload;
+      const currencySettlementConfig = callerPayload.metadata?.currency_settlement_config || {};
+      return {
+        ...callerPayload,
+        metadata: {
+          ...(callerPayload.metadata || {}),
+          currency_settlement_config: {
+            ...currencySettlementConfig,
+            settlement_type: 'virtual_currency',
+            settlement_ids: [virtualSettlement.currencyProductId],
+            currency_display_snapshot: (0, _lodashEs.cloneDeep)(currencySettlementConfig.currency_display_snapshot ?? (0, _virtualSettlement.buildCurrencyDisplaySnapshot)(virtualSettlement.snapshot))
+          }
+        },
+        currency_code: virtualSettlement.currencyCode,
+        currency_symbol: virtualSettlement.currencySymbol,
+        currency_format: virtualSettlement.currencyFormat
+      };
+    } : params?.enhancePayload;
+    const enhancePayload = this.buildSubmitPayloadEnhancerWithOpenDataConfig(virtualSettlementEnhancePayload);
     const submitParams = {
       cacheId: this.cacheId,
       platform: this.otherParams?.platform,
@@ -2012,28 +2113,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       } : params?.confirmPendingVoucherPayments !== undefined ? {
         confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
       } : {}),
-      ...(virtualSettlement ? {
-        enhancePayload: (payload, ctx) => {
-          const callerPayload = params?.enhancePayload ? params.enhancePayload(payload, ctx) : payload;
-          const currencySettlementConfig = callerPayload.metadata?.currency_settlement_config || {};
-          return {
-            ...callerPayload,
-            metadata: {
-              ...(callerPayload.metadata || {}),
-              currency_settlement_config: {
-                ...currencySettlementConfig,
-                settlement_type: 'virtual_currency',
-                settlement_ids: [virtualSettlement.currencyProductId],
-                currency_display_snapshot: (0, _lodashEs.cloneDeep)(currencySettlementConfig.currency_display_snapshot ?? (0, _virtualSettlement.buildCurrencyDisplaySnapshot)(virtualSettlement.snapshot))
-              }
-            },
-            currency_code: virtualSettlement.currencyCode,
-            currency_symbol: virtualSettlement.currencySymbol,
-            currency_format: virtualSettlement.currencyFormat
-          };
-        }
-      } : params?.enhancePayload !== undefined ? {
-        enhancePayload: params.enhancePayload
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
@@ -2059,6 +2140,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     const inferredPaymentStatus = this.getSubmitPaymentStatus(params?.paymentStatus);
     const smallTicketDataFlag = params?.smallTicketDataFlag ?? this.getDefaultCheckoutSmallTicketDataFlag();
+    const enhancePayload = this.buildSubmitPayloadEnhancerWithOpenDataConfig(params?.enhancePayload);
     const submitParams = {
       cacheId: this.cacheId,
       platform: this.otherParams?.platform,
@@ -2078,8 +2160,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       ...(params?.confirmPendingVoucherPayments !== undefined ? {
         confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
       } : {}),
-      ...(params?.enhancePayload !== undefined ? {
-        enhancePayload: params.enhancePayload
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     return this.store.order.submitTempOrderAsync(submitParams);
@@ -2129,7 +2211,18 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       channel: context.channel,
       type: context.type
     });
-    const response = await this.request.post('/local/print-order', payload, {
+    const invoiceLayoutConfig = this.getCachedInvoiceLayoutConfig();
+    const invoiceTemplateSettings = this.getCachedInvoiceTemplateSettings();
+    const printPayload = {
+      ...payload,
+      ...(invoiceLayoutConfig ? {
+        invoice: (0, _lodashEs.cloneDeep)(invoiceLayoutConfig)
+      } : {}),
+      ...(invoiceTemplateSettings ? {
+        template_settings: (0, _lodashEs.cloneDeep)(invoiceTemplateSettings)
+      } : {})
+    };
+    const response = await this.request.post('/local/print-order', printPayload, {
       osServer: true,
       customToast: () => {}
     });
@@ -2152,6 +2245,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     const businessCode = params.businessCode ?? this.otherParams?.businessCode ?? this.otherParams?.business_code;
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
+    const enhancePayload = this.buildSubmitPayloadEnhancerWithOpenDataConfig(params.enhancePayload);
     const syncParams = {
       ...params,
       checkoutSyncTaskEnabled: this.shouldUseCheckoutSyncTask(),
@@ -2160,6 +2254,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       } : {}),
       ...(channel !== undefined ? {
         channel
+      } : {}),
+      ...(enhancePayload !== undefined ? {
+        enhancePayload
       } : {})
     };
     const syncState = this.store.order.getOrderSyncState();

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 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 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

@@ -1,9 +1,9 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketState, IGetCustomerListParams, ICustomer, ILoadProductsParams, ILoadProductDetailParams, IScanResult } from './types';
 import type { ProductData } from '../../modules';
-import type { OpenDataConfig } from '../../modules/OpenData';
+import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView } from '../../modules/Order/types';
+import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -30,7 +30,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
     private orderCustomerPromotionRefreshInFlight;
-    private loadOpenDataConfigInFlight;
+    protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
+    protected loadOpenDataInFlightTarget: string | null;
+    protected openDataTarget: string | null;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
      * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
@@ -43,10 +45,13 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected createSubModule(moduleName: string): Module | null;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
-    private getBookingTicketBusinessCode;
+    protected getBookingTicketBusinessCode(): string | null;
     private getIdGeneratorPlugin;
     private loadOpenDataConfig;
     getOpenData(): Promise<OpenDataConfig | null>;
+    getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
+    getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
+    protected isInvoiceOpenDataCacheCurrent(): boolean;
     /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
     clearOpenDataCache(): void;
     private getShortNumberOrDeviceId;
@@ -260,7 +265,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null): void;
+    setOrderCustomer(customer: ICustomer | null, options?: {
+        source?: OrderCustomerChangePayload['source'];
+    }): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */
@@ -332,7 +339,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -451,19 +458,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    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;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**