@pisell/pisellos 2.2.309 → 2.2.310

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentOptions, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
@@ -72,6 +72,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private walletAssetsRefreshSequence;
     private salesDetailHydrateQueue;
     private serverOrderChangeUnsubscribe;
+    private paymentMethodsChangedUnsubscribe;
     private serverOrderChangeHydrateInFlight;
     private queuedServerOrderChanges;
     private serverOrderChangeSyncEnabled;
@@ -101,6 +102,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private drainQueuedServerOrderChanges;
     private syncCurrentSalesDetailFromServerOrderChange;
     private registerServerOrderChangeSync;
+    private registerPaymentMethodsChangeSync;
     private hydrateLatestLoadedSalesDetail;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
@@ -271,6 +273,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private mergeHistoricalDiscountList;
     private shouldSkipAutoApplyFetchedDiscountsInEditMode;
     private mergeCurrentDiscountSelectionState;
+    private resolveDiscountConfigCustomerId;
+    /**
+     * Stable across notifyTempOrderChanged's immutable object replacement, while
+     * still distinguishing two local orders for the same customer.
+     */
+    private getDiscountConfigOrderIdentityKey;
     loadDiscountConfig(params?: {
         customerId?: number;
         action?: 'create' | 'edit';
@@ -407,6 +415,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     refreshWalletAssets(params?: {
         order_wait_pay_amount?: number;
         preserveSelection?: boolean;
+        retainSearchResultCodes?: string[];
     }): Promise<WalletAssetsState>;
     /** 选择或取消单张钱包资产，并立即同步 pending wallet payments。 */
     selectWalletAsset(params: {
@@ -442,7 +451,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private findCashPaymentMethod;
     private getPendingWalletPaymentAmount;
     /** 读取现金 action 所需的支付方式、待付金额和快捷金额。 */
-    getCashPaymentConfig(): Promise<BaseSalesCashPaymentConfig>;
+    getCashPaymentConfig(options?: BaseSalesCashPaymentOptions): Promise<BaseSalesCashPaymentConfig>;
     /**
      * 确认足额覆盖订单的 pending Wallet 支付并提交订单。
      *

package/lib/solution/BaseSales/index.js

@@ -37,6 +37,7 @@ 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 PAYMENT_METHODS_CHANGED_EVENT = 'payment:onPaymentMethodsChanged';
 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';
@@ -345,6 +346,7 @@ function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
   return currentNotes !== null && loadedNotes !== null && (0, _lodashEs.isEqual)(currentNotes, loadedNotes);
 }
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
+  const loadedHasOrderMetaList = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'order_meta_list');
   const loadedHasSalesNotes = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'notes');
   const hasDirtyLocalSalesNotes = currentTempOrder?._extend?.salesNotesState?.dirty === true;
   const incomingSalesNotesMatchLocal = loadedHasSalesNotes && areBaseSalesNotesEquivalent(currentTempOrder?.notes, loadedRecord.notes, {
@@ -363,6 +365,12 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   });
   const uidRemaps = [];
   const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+    // order_meta_list 是服务端/本地订单携带的完整业务快照。若 incoming
+    // 明确提供它，必须整体替换；若省略，则保留当前值，避免 snapshot
+    // 数组递归拼接后出现同 ID 的旧数据。
+    if (key === 'order_meta_list') {
+      return (0, _lodashEs.cloneDeep)(loadedHasOrderMetaList ? loadedValue : currentValue);
+    }
     if (key === 'notes') {
       if (preserveDirtyLocalSalesNotes && Array.isArray(currentValue)) {
         return (0, _lodashEs.cloneDeep)(currentValue);
@@ -487,6 +495,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   walletAssetsRefreshSequence = 0;
   salesDetailHydrateQueue = Promise.resolve();
   serverOrderChangeUnsubscribe = null;
+  paymentMethodsChangedUnsubscribe = null;
   serverOrderChangeHydrateInFlight = null;
   queuedServerOrderChanges = [];
   serverOrderChangeSyncEnabled = false;
@@ -630,6 +639,15 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     });
   }
+  registerPaymentMethodsChangeSync() {
+    this.paymentMethodsChangedUnsubscribe?.();
+    const effects = this.core?.effects;
+    if (!effects || typeof effects.on !== 'function') return;
+    this.paymentMethodsChangedUnsubscribe = effects.on(PAYMENT_METHODS_CHANGED_EVENT, async payload => {
+      if (!Array.isArray(payload?.newMethods)) return;
+      await this.getPaymentMethodsAsync();
+    });
+  }
   async hydrateLatestLoadedSalesDetail(record, loadSequence, options) {
     let hydratedSales = null;
     let skippedBeforeHydrate = false;
@@ -1331,9 +1349,22 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
   syncAppDataToTempOrder(tempOrder) {
     const isPriceIncludeTax = this.getAppData('is_price_include_tax');
-    const taxCountryCode = this.getAppData('tax_country_code');
-    const currencyCode = this.getAppData('shop_currency_code');
-    const currencySymbol = this.getAppData('shop_symbol');
+    const rawTaxCountryCode = this.getAppData('tax_country_code');
+    const rawCurrencyCode = this.getAppData('shop_currency_code');
+    const rawCurrencySymbol = this.getAppData('shop_symbol');
+    const normalizeNonBlankValue = value => {
+      if (value === undefined || value === null) return undefined;
+      const normalizedValue = String(value).trim();
+      return normalizedValue || undefined;
+    };
+    const taxCountryCode = normalizeNonBlankValue(rawTaxCountryCode);
+    const currencyCode = normalizeNonBlankValue(rawCurrencyCode);
+    const currencySymbol = normalizeNonBlankValue(rawCurrencySymbol);
+    const before = {
+      tax_country_code: tempOrder.tax_country_code,
+      currency_code: tempOrder.currency_code,
+      currency_symbol: tempOrder.currency_symbol
+    };
     // 历史虚拟币订单不依赖交易开关；普通 POS 不从商品行残留快照推断订单币种。
     const isHistoricalVirtualSettlement = this.isHistoricalVirtualSettlementOrder(tempOrder);
     const isVirtualSettlement = this.isActiveVirtualSettlementOrder(tempOrder) || isHistoricalVirtualSettlement;
@@ -1347,9 +1378,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       }
     }
     if (taxCountryCode !== undefined) {
-      const nextTaxCountryCode = String(taxCountryCode || '');
-      if (tempOrder.tax_country_code !== nextTaxCountryCode) {
-        tempOrder.tax_country_code = nextTaxCountryCode;
+      if (tempOrder.tax_country_code !== taxCountryCode) {
+        tempOrder.tax_country_code = taxCountryCode;
         isChanged = true;
       }
     }
@@ -1366,19 +1396,45 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       }
     }
     if (!isVirtualSettlement && currencyCode !== undefined) {
-      const nextCurrencyCode = String(currencyCode || '');
-      if (tempOrder.currency_code !== nextCurrencyCode) {
-        tempOrder.currency_code = nextCurrencyCode;
+      if (tempOrder.currency_code !== currencyCode) {
+        tempOrder.currency_code = currencyCode;
         isChanged = true;
       }
     }
     if (!isVirtualSettlement && currencySymbol !== undefined) {
-      const nextCurrencySymbol = String(currencySymbol || '');
-      if (tempOrder.currency_symbol !== nextCurrencySymbol) {
-        tempOrder.currency_symbol = nextCurrencySymbol;
+      if (tempOrder.currency_symbol !== currencySymbol) {
+        tempOrder.currency_symbol = currencySymbol;
         isChanged = true;
       }
     }
+    try {
+      const orderIdentity = this.store.order?.getOrderIdentity?.();
+      this.logger?.addLog?.({
+        type: 'info',
+        title: 'syncAppDataToTempOrder',
+        metadata: {
+          moduleName: this.name,
+          cacheId: this.cacheId,
+          orderId: orderIdentity?.orderId ?? tempOrder.order_id,
+          externalSaleNumber: orderIdentity?.externalSaleNumber ?? tempOrder.external_sale_number,
+          shopOrderNumber: orderIdentity?.shopOrderNumber ?? tempOrder.shop_order_number,
+          readValues: {
+            tax_country_code: rawTaxCountryCode,
+            shop_currency_code: rawCurrencyCode,
+            shop_symbol: rawCurrencySymbol
+          },
+          before,
+          after: {
+            tax_country_code: tempOrder.tax_country_code,
+            currency_code: tempOrder.currency_code,
+            currency_symbol: tempOrder.currency_symbol
+          },
+          isChanged
+        }
+      });
+    } catch {
+      // 诊断日志不能影响订单字段同步。
+    }
     return isChanged;
   }
   async initialize(core, options = {}) {
@@ -1429,12 +1485,15 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       this.store.order.setEnableTempOrderPersist(this.otherParams.enableTempOrderPersist);
     }
     await this.getPaymentMethodsAsync();
+    this.registerPaymentMethodsChangeSync();
     this.registerServerOrderChangeSync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
     this.serverOrderChangeUnsubscribe?.();
     this.serverOrderChangeUnsubscribe = null;
+    this.paymentMethodsChangedUnsubscribe?.();
+    this.paymentMethodsChangedUnsubscribe = null;
     Object.keys(this.store).forEach(key => {
       if (this.reusedSharedSubModuleNames.has(key)) return;
       const sub = this.store[key];
@@ -1790,7 +1849,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (!this.isPersistedOrderProduct(item)) return;
       (item.discount_list || []).forEach(discount => {
         const discountId = discount.discount?.resource_id || discount.id;
-        if (!discountId || !['good_pass', 'discount_card'].includes(discount.type)) return;
+        if (!discountId || !['entitlement_pass', 'good_pass', 'discount_card'].includes(discount.type)) return;
         const quantity = item.quantity || item.num || item.product_quantity || 1;
         const savedAmount = new _decimal.default(discount.amount || 0).times(quantity).plus(discount?.metadata?.product_discount_difference || 0);
         const index = historyDiscountList.findIndex(n => n.id === discountId);
@@ -1882,19 +1941,46 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       return discount;
     });
   }
+  resolveDiscountConfigCustomerId(tempOrder) {
+    return Number(tempOrder?.customer_id || tempOrder?.customer?.id || tempOrder?._extend?.customerSnapshot?.id || tempOrder?._extend?.customerSnapshot?.customer_id || 0);
+  }
+
+  /**
+   * Stable across notifyTempOrderChanged's immutable object replacement, while
+   * still distinguishing two local orders for the same customer.
+   */
+  getDiscountConfigOrderIdentityKey(tempOrder) {
+    const identity = this.store.order?.getOrderIdentity?.();
+    return JSON.stringify([identity?.orderId ?? tempOrder?.order_id ?? '', tempOrder?.request_unique_idempotency_token ?? '', identity?.externalSaleNumber ?? tempOrder?.external_sale_number ?? '', identity?.localId ?? tempOrder?._extend?.localId ?? this.cacheId ?? '']);
+  }
   async loadDiscountConfig(params) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     const tempOrder = this.store.order.ensureTempOrder();
     const orderStore = this.store.order.store || {};
     const discountModule = orderStore.discount;
     const rulesModule = orderStore.rules;
-    const orderId = tempOrder.order_id || this.getOrderIdentity?.()?.orderId;
+    const orderId = tempOrder.order_id || this.store.order.getOrderIdentity?.()?.orderId;
     const customerId = Number(params?.customerId || tempOrder.customer_id || tempOrder.customer?.id || tempOrder._extend?.customerSnapshot?.id || tempOrder._extend?.customerSnapshot?.customer_id || 0);
     const currentDiscountList = discountModule?.getDiscountList?.() || [];
     const originalDiscountList = discountModule?.getOriginalDiscountList?.() || [];
     const hasManualDiscountSelection = this.hasManualDiscountSelection || currentDiscountList.some(discount => discount.isManualSelect);
     const discountAction = params?.action || (orderId ? 'edit' : 'create');
-    const discountConfigCacheKey = [customerId, discountAction, Number(orderId) || 0].join(':');
+    const requestOrderIdentityKey = this.getDiscountConfigOrderIdentityKey(tempOrder);
+    const discountConfigCacheKey = JSON.stringify([customerId, discountAction, Number(orderId) || 0, requestOrderIdentityKey]);
+    let requestEpoch = this.store.order.getCustomerWalletPrepareConfigEpoch?.();
+    const isCurrentRequest = () => {
+      const currentTempOrder = this.store.order?.getTempOrder?.();
+      return Boolean(currentTempOrder && (requestEpoch === undefined || this.store.order?.getCustomerWalletPrepareConfigEpoch?.() === requestEpoch) && this.resolveDiscountConfigCustomerId(currentTempOrder) === customerId && this.getDiscountConfigOrderIdentityKey(currentTempOrder) === requestOrderIdentityKey);
+    };
+    const getCurrentResult = () => {
+      const currentTempOrder = this.store.order?.getTempOrder?.();
+      return {
+        productList: currentTempOrder?.products || [],
+        discountList: discountModule?.getDiscountList?.() || [],
+        availableWalletIds: this.getAvailableWalletIds(),
+        virtualCurrencyList: this.getVirtualCurrencyList()
+      };
+    };
 
     // Walk-In 不请求 prepare config；当前搜索/扫码券必须继续参与本次重算。
     // current 优先于 original，保留搜索后的最新选择与可用状态。
@@ -1905,26 +1991,34 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (!params?.force && this.discountConfigCacheKey === discountConfigCacheKey) {
         preparedDiscountList = originalDiscountList;
       } else {
-        preparedDiscountList = await this.store.order.loadDiscountConfig({
+        const prepareConfigPromise = this.store.order.loadDiscountConfig({
           customerId,
           action: discountAction,
           orderId: Number(orderId) || undefined,
           apply: false
         });
-        this.discountConfigCacheKey = discountConfigCacheKey;
+        // OrderModule increments this epoch synchronously before its first await.
+        requestEpoch = this.store.order.getCustomerWalletPrepareConfigEpoch?.();
+        preparedDiscountList = await prepareConfigPromise;
+        if (!isCurrentRequest()) return getCurrentResult();
         await discountModule?.setOriginalDiscountList?.(preparedDiscountList);
+        if (!isCurrentRequest()) return getCurrentResult();
+        this.discountConfigCacheKey = discountConfigCacheKey;
       }
     }
     if (this.isActiveVirtualSettlementOrder(tempOrder)) {
+      if (!isCurrentRequest()) return getCurrentResult();
       await discountModule?.setOriginalDiscountList?.([]);
+      if (!isCurrentRequest()) return getCurrentResult();
       await discountModule?.setDiscountList?.([]);
+      if (!isCurrentRequest()) return getCurrentResult();
       tempOrder.discount_list = [];
       tempOrder.shop_discount = '0.00';
       return {
         productList: tempOrder.products || [],
         discountList: [],
         availableWalletIds: this.getAvailableWalletIds(),
-        virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+        virtualCurrencyList: this.getVirtualCurrencyList()
       };
     }
     if (hasManualDiscountSelection && currentDiscountList.length) {
@@ -1932,12 +2026,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         productList: tempOrder.products || [],
         discountList: currentDiscountList,
         availableWalletIds: this.getAvailableWalletIds(),
-        virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+        virtualCurrencyList: this.getVirtualCurrencyList()
       };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(preparedDiscountList || discountModule?.getDiscountList?.() || [], tempOrder.products || []);
     nextDiscountList = this.mergeCurrentDiscountSelectionState(nextDiscountList, currentDiscountList);
+    if (!isCurrentRequest()) return getCurrentResult();
     await discountModule?.setDiscountList(nextDiscountList);
+    if (!isCurrentRequest()) return getCurrentResult();
     const shouldSkipAutoApplyFetchedDiscounts = this.shouldSkipAutoApplyFetchedDiscountsInEditMode({
       discountAction,
       products: tempOrder.products || [],
@@ -1945,24 +2041,28 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       nextDiscountList
     });
     if (shouldSkipAutoApplyFetchedDiscounts) {
-      const summary = await this.store.order.recalculateSummary({
+      await this.store.order.recalculateSummary({
         createIfMissing: true
       });
+      if (!isCurrentRequest()) return getCurrentResult();
       this.store.order.persistTempOrder();
+      if (!isCurrentRequest()) return getCurrentResult();
       await this.effectsEmit('onDiscountApplied', {
         productList: tempOrder.products || [],
         discountList: nextDiscountList,
         selectedDiscountList: tempOrder.discount_list || [],
         tempOrder
       });
+      if (!isCurrentRequest()) return getCurrentResult();
       return {
         productList: tempOrder.products || [],
         discountList: nextDiscountList,
         availableWalletIds: this.getAvailableWalletIds(),
-        virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+        virtualCurrencyList: this.getVirtualCurrencyList()
       };
     }
     if (rulesModule) {
+      if (!isCurrentRequest()) return getCurrentResult();
       const orderTotalAmount = Number(orderStore.summary?.total_amount || 0);
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
@@ -1998,25 +2098,31 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       if (result.discountList) {
         nextDiscountList = this.mergeHistoricalDiscountList(result.discountList, tempOrder.products || []);
         _Order.OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
+        if (!isCurrentRequest()) return getCurrentResult();
         await discountModule?.setDiscountList(nextDiscountList);
+        if (!isCurrentRequest()) return getCurrentResult();
         tempOrder.discount_list = nextDiscountList.filter(discount => discount.isSelected);
       }
     }
-    const summary = await this.store.order.recalculateSummary({
+    if (!isCurrentRequest()) return getCurrentResult();
+    await this.store.order.recalculateSummary({
       createIfMissing: true
     });
+    if (!isCurrentRequest()) return getCurrentResult();
     this.store.order.persistTempOrder();
+    if (!isCurrentRequest()) return getCurrentResult();
     await this.effectsEmit('onDiscountApplied', {
       productList: tempOrder.products || [],
       discountList: nextDiscountList,
       selectedDiscountList: tempOrder.discount_list || [],
       tempOrder
     });
+    if (!isCurrentRequest()) return getCurrentResult();
     return {
       productList: tempOrder.products || [],
       discountList: nextDiscountList,
       availableWalletIds: this.getAvailableWalletIds(),
-      virtualCurrencyList: this.store.order.getVirtualCurrencyList()
+      virtualCurrencyList: this.getVirtualCurrencyList()
     };
   }
   getAvailableWalletIds() {
@@ -2057,6 +2163,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
         holders: [],
         isFormSubject: product => (0, _utils.resolveIsFormSubject)(tempOrder, product),
         orderTotalAmount
+      }, {
+        preserveEntitlementSelection: false
       }) || result;
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
@@ -2972,6 +3080,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       };
     }
     const result = await this.store.payment.wallet.initializeWalletDataFromBusinessAsync(walletBusinessData);
+    this.store.order.mergePointCardSnapshotCodes?.(result.userIdentificationCodes, {
+      customerId: walletBusinessData.customer_id,
+      orderIdentity: snapshot?.identity
+    });
     await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
       orderId: snapshot?.identity?.orderId,
       customerId: walletBusinessData.customer_id,
@@ -3098,6 +3210,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   async importWalletAssetsSnapshot(snapshot) {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     const state = this.store.payment.wallet.importWalletAssetsSnapshot(snapshot);
+    this.store.order?.mergePointCardSnapshotCodes?.(state.items);
     await this.syncSelectedWalletAssets(state);
     return this.publishWalletAssetsState(state);
   }
@@ -3119,6 +3232,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
       return this.publishWalletAssetsState(emptyState);
     }
+    const pointCardSnapshotMergeContext = {
+      customerId: businessData.customer_id,
+      orderIdentity: this.store.order.getOrderSnapshot()?.identity
+    };
     const previousState = wallet.getWalletAssetsState();
     const hasPreviousWalletContext = previousState.status !== 'idle' || previousState.items.length > 0 || previousState.selectedIds.length > 0 || previousState.customerId !== undefined;
     const customerChanged = hasPreviousWalletContext && String(previousState.customerId ?? '') !== String(businessData.customer_id ?? '');
@@ -3130,7 +3247,8 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       await this.publishWalletAssetsState(clearedState);
     }
     const refreshTask = wallet.refreshWalletAssetsFromBusinessAsync(businessData, {
-      preserveSelection: params?.preserveSelection !== false && !customerChanged
+      preserveSelection: params?.preserveSelection !== false && !customerChanged,
+      retainSearchResultCodes: params?.retainSearchResultCodes
     });
     await this.publishWalletAssetsState(wallet.getWalletAssetsState());
     let state = await refreshTask;
@@ -3140,6 +3258,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (state.status !== 'error') {
       const committed = this.getCommittedWalletAssets();
       state = wallet.setCommittedWalletAssets(committed.ids, committed.assets);
+      this.store.order.mergePointCardSnapshotCodes?.(wallet.getUserIdentificationCodes?.() || [], pointCardSnapshotMergeContext);
     }
     await this.syncSelectedWalletAssets(state);
     return this.publishWalletAssetsState(state);
@@ -3197,7 +3316,13 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
    */
   updateOrderCustomer(customer) {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    const previousCustomerId = this.resolveDiscountConfigCustomerId(this.store.order.getTempOrder?.());
     const result = this.store.order.updateTempOrderCustomer(customer);
+    const nextCustomerId = this.resolveDiscountConfigCustomerId(this.store.order.getTempOrder?.());
+    if (String(previousCustomerId) !== String(nextCustomerId)) {
+      this.discountConfigCacheKey = null;
+      this.hasManualDiscountSelection = false;
+    }
     this.store.order.recalculateSummary({
       createIfMissing: true
     });
@@ -3231,10 +3356,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   getPaymentMethods() {
     return [...this.paymentMethodsCache];
   }
-  findCashPaymentMethod(paymentMethods) {
+  findCashPaymentMethod(paymentMethods, paymentMethodId) {
     return paymentMethods.find(method => {
+      if (method?.enabled === false || method?.enable === false) return false;
       const identifiers = [method?.code, method?.type, method?.tag].map(value => String(value || '').toUpperCase());
-      return identifiers.includes('CASHMANUAL') && method?.enabled !== false && method?.enable !== false;
+      const isDefaultCash = identifiers.includes('CASHMANUAL');
+      if (paymentMethodId === undefined) return isDefaultCash;
+      const isCustomCash = String(method?.type || '').trim().toLowerCase() === 'custom' && [method?.name, method?.nameEn].some(name => typeof name === 'string' && /现金|現金|cash/i.test(name));
+      return String(method?.id) === String(paymentMethodId) && (isDefaultCash || isCustomCash);
     });
   }
   getPendingWalletPaymentAmount(payments = this.store.order?.getOrderPayments?.() || []) {
@@ -3251,13 +3380,16 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
   }
 
   /** 读取现金 action 所需的支付方式、待付金额和快捷金额。 */
-  async getCashPaymentConfig() {
+  async getCashPaymentConfig(options = {}) {
     if (!this.store.payment) throw new Error('payment 模块未初始化');
     let paymentMethods = this.getPaymentMethods();
-    let paymentMethod = this.findCashPaymentMethod(paymentMethods);
+    let paymentMethod = this.findCashPaymentMethod(paymentMethods, options.paymentMethodId);
     if (!paymentMethod) {
       paymentMethods = await this.getPaymentMethodsAsync();
-      paymentMethod = this.findCashPaymentMethod(paymentMethods);
+      paymentMethod = this.findCashPaymentMethod(paymentMethods, options.paymentMethodId);
+    }
+    if (!paymentMethod && options.paymentMethodId !== undefined) {
+      throw new Error(`未找到可用的现金支付方式：${options.paymentMethodId}`);
     }
     const amountSnapshot = this.store.order?.getOrderAmountSnapshot?.();
     const pendingWalletAmount = this.getPendingWalletPaymentAmount();
@@ -3355,7 +3487,9 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!Number.isFinite(amount) || amount <= 0) {
       throw new Error('现金支付金额必须大于 0');
     }
-    const config = await this.getCashPaymentConfig();
+    const config = params.paymentMethodId === undefined ? await this.getCashPaymentConfig() : await this.getCashPaymentConfig({
+      paymentMethodId: params.paymentMethodId
+    });
     const paymentMethod = config.paymentMethod;
     if (!paymentMethod) throw new Error('未找到可用的 CASHMANUAL 支付方式');
     if (config.amountDue <= 0) throw new Error('当前订单没有待支付金额');

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

@@ -23,13 +23,17 @@ export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSales
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
 export type BaseSalesStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export type BaseSalesPaymentStatus = 'paid' | 'partially_paid' | 'unpaid' | 'payment_processing' | string;
+export interface BaseSalesCashPaymentOptions {
+    /** 指定现金支付方式；省略时使用默认 CASHMANUAL。 */
+    paymentMethodId?: number | string;
+}
 export interface BaseSalesCashPaymentConfig {
     available: boolean;
     paymentMethod?: PaymentMethod;
     amountDue: number;
     recommendedAmounts: number[];
 }
-export interface BaseSalesPayCashParams {
+export interface BaseSalesPayCashParams extends BaseSalesCashPaymentOptions {
     /** 实际计入订单的现金支付金额（部分支付时小于待付金额）。 */
     amount: number;
     /** 顾客实际交付现金；可大于 amount。 */
@@ -441,10 +445,10 @@ export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 /** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
-    /** 卡券已加入 Promotion；false 时可能是无效、过期或已使用。 */
+    /** 卡券已加入 Promotion；可能因次数、时间或当前订单条件而暂时无法应用。 */
     isAccepted?: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；Holder 补全等流程可从这里读取原始卡券。 */
+    /** 扫码卡券资料及最新可用状态，供 Holder 补全等流程使用。 */
     scannedDiscountList?: Discount[];
 }

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -17,6 +17,7 @@ exports.resolveStrategyEligibleProducts = resolveStrategyEligibleProducts;
 exports.resolveStrategyRequiredQuantity = resolveStrategyRequiredQuantity;
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
+var _entitlementPass = require("../../../modules/Discount/entitlementPass");
 var _utils = require("../../../modules/Order/utils");
 var _utils2 = require("../../ScanOrder/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -395,11 +396,16 @@ function getProductLineNoteSignature(product) {
   const uid = getOrderProductUid(product);
   return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
-function hasGoodPassDiscount(product) {
+function getFullCoveragePassDiscountType(product) {
   const productBundle = Array.isArray(product?.product_bundle) ? product.product_bundle : [];
   const extendedBundle = Array.isArray(product?._extend?.other?.bundle) ? product._extend.other.bundle : [];
   const discountLists = [product?.discount_list, ...productBundle.map(item => item?.discount_list), ...extendedBundle.map(item => item?.discount_list)];
-  return discountLists.some(discountList => Array.isArray(discountList) && discountList.some(item => item?.type === 'good_pass' || item?.tag === 'good_pass'));
+  for (const discountList of discountLists) {
+    if (!Array.isArray(discountList)) continue;
+    const pass = discountList.find(item => (0, _entitlementPass.isFullCoveragePass)(item));
+    if (pass) return String(pass.type || pass.tag);
+  }
+  return null;
 }
 
 /**
@@ -412,8 +418,10 @@ function getPromotionLineMergeBoundary(product) {
   if (product?.product_id === undefined || product?.product_id === null) {
     return `custom:${getOrderProductUid(product)}`;
   }
-  if (hasGoodPassDiscount(product)) {
-    return `good-pass:${getOrderProductUid(product)}`;
+  const fullCoveragePassType = getFullCoveragePassDiscountType(product);
+  if (fullCoveragePassType) {
+    const boundary = fullCoveragePassType === 'good_pass' ? 'good-pass' : 'entitlement-pass';
+    return `${boundary}:${getOrderProductUid(product)}`;
   }
   if (Number(product?.product_sku?.open_sold_weight || 0) === 1) {
     return `weighing:${getOrderProductUid(product)}`;

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 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -8,6 +8,7 @@ import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
+import type { GlobalScanSearchType } from './utils/scan/formatGlobalScan';
 import type { AddAddTimeProductToBookingInput, AddAddTimeProductsToBookingInput, GlobalScanHandleResult, GlobalScanHostBridge } from './types';
 import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
 import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
@@ -29,7 +30,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
+    private readonly customerResolveRequests;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;
     protected openDataTarget: string | null;
@@ -45,6 +48,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;
@@ -72,10 +81,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
     /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
-    private findCustomerById;
     private normalizeCustomer;
     private getRawCustomerId;
-    private hasUsableCustomerDetails;
     /**
      * 更新当前预约的 appointment_status。
      *
@@ -339,7 +346,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 客户状态
@@ -531,6 +538,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * ```
      */
     handleGlobalScanCode(code: string, bridge?: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;
+    /** 查询码类型；复用原有识别和缓存，不写订单、不打开选择 UI。 */
+    getGlobalScanCodeType(code: string): Promise<GlobalScanSearchType | null>;
     resolveBestAddTimePlan(addTimeProducts: any[], targetMinutes: number): any;
     /**
      * 构造一条绑定到已有 booking 的加时商品行。