@pisell/pisellos 2.2.310 → 2.2.312-vm.0

package/lib/modules/Rules/index.js

@@ -20,6 +20,10 @@ class RulesModule extends _BaseModule.BaseModule {
   store;
   window; // WindowPlugin 实例
   hooks;
+  discountScope;
+  setDiscountScope(scope) {
+    this.discountScope = scope;
+  }
   constructor(name, version) {
     super(name, version);
     this.hooks = {};
@@ -722,6 +726,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
     // 辅助函数：检查商品是否对某个折扣卡可用
     const checkItemApplicableForDiscount = (flatItem, discount) => {
+      if (this.discountScope && !this.discountScope(flatItem.originProduct, discount)) return false;
       if (discount.config?.isAvailable === false) return false;
       let product;
       if (flatItem.type === 'main') {
@@ -1093,6 +1098,7 @@ class RulesModule extends _BaseModule.BaseModule {
 
       // 找到适用于此商品的所有优惠券，仅考虑isSelected不为false的优惠券
       const applicableDiscounts = sortedDiscountList.filter(discount => {
+        if (this.discountScope && !this.discountScope(originProduct, discount)) return false;
         if (this.isItemRewardProductDiscount(product)) return false;
         // 🔥 检查策略可用性（针对全额抵扣卡和折扣卡）
         const discountType = discount.tag || discount.type;

package/lib/server/modules/floor-plan/index.js

@@ -9,6 +9,30 @@ var _types = require("./types");
 const FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
 const FLOOR_PLAN_STORE_NAME = 'floor_plans';
 
+/**
+ * Request failures can be plain response objects (rather than Error instances).
+ * Keep diagnostics useful without allowing the UI bridge to stringify them as
+ * "[object Object]".
+ */
+function getRequestErrorInfo(error) {
+  if (error instanceof Error && error.message) return {
+    message: error.message
+  };
+  if (typeof error === 'string' && error) return {
+    message: error
+  };
+  const value = error;
+  const response = value?.resData?.res ?? value?.response?.data ?? value?.data ?? value;
+  const candidates = [value?.message, value?.error, response?.message, response?.error];
+  const message = candidates.find(candidate => typeof candidate === 'string' && candidate.trim() !== '');
+  return {
+    message: message || '平面图加载失败（未提供错误详情）',
+    code: response?.code ?? value?.code,
+    status: response?.status ?? value?.status,
+    httpStatus: value?.response?.status
+  };
+}
+
 /**
  * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
  */
@@ -144,8 +168,12 @@ class FloorPlanModule extends _BaseModule.BaseModule {
       const list = Array.isArray(raw) ? raw : [];
       return list;
     } catch (e) {
+      const errorInfo = getRequestErrorInfo(e);
       this.logWarning('loadListFromServer 失败', {
-        error: e instanceof Error ? e.message : String(e)
+        error: errorInfo.message,
+        code: errorInfo.code,
+        status: errorInfo.status,
+        httpStatus: errorInfo.httpStatus
       });
       return [];
     }

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

@@ -1,3 +1,4 @@
+import { InventoryController, type CheckoutRuntimeSnapshot } from '../../inventory';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentOptions, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
@@ -47,6 +48,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
+    getInventory(): InventoryController | undefined;
+    prepareCheckout(signal?: AbortSignal): Promise<CheckoutRuntimeSnapshot | undefined>;
     protected cacheId: string | undefined;
     /**
      * 由已在初始化阶段解析过设备短号的业务解决方案写入。
@@ -166,6 +169,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 可覆盖此方法并把未识别的 name 委托给 `super.createSubModule(name)`。
      */
     protected createSubModule(moduleName: string): Module | null;
+    private inventoryOrderHooks?;
     protected getSubModuleHooks(moduleName: string): any;
     /**
      * 构造传给 BaseSales 子模块的完整运行态参数，保证初始化和后续同步语义一致。
@@ -203,7 +207,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private isActiveVirtualSettlementOrder;
     private isHistoricalVirtualSettlementOrder;
     private syncAppDataToTempOrder;
+    private initialization?;
+    /** Hosts can await readiness without changing Core's synchronous registration API. */
+    whenInitialized(): Promise<void>;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    private initializeSalesRuntime;
     destroy(): Promise<void>;
     /**
      * 加载销售订单到统一 tempOrder 工作区。
@@ -306,7 +314,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         discountList: Discount[];
         originalDiscountList?: Discount[];
     }): Promise<void>;
-    scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
+    scanPromotionCode(code: string, customerId?: number, options?: {
+        productVouchersOnly?: boolean;
+    }): Promise<BaseSalesScanCodeResult>;
     setDiscountSelected(params: {
         discountId: number;
         isSelected: boolean;
@@ -498,6 +508,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private hasSmartPricingStrategies;
     shouldRecalculateProductBookingPricesForContextChange(params: BaseSalesPriceRecalculationContextChange): boolean;
     calculateProductBookingPrices(paramsList: BaseSalesCalculateProductBookingPriceParams[]): Promise<BaseSalesProductBookingPriceResult[]>;
+    setProductVoucherGroups(groups: Array<{
+        key: string;
+        discountIds: Array<number | string>;
+    }>): void;
+    validateProductVoucherSelection(): void;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProducts(paramsList: UpdateOrderProductParams[]): Promise<import("../../modules/Order/types").OrderProduct[]>;

package/lib/solution/BaseSales/index.js

@@ -7,6 +7,7 @@ var _exportNames = {
   BaseSalesImpl: true
 };
 exports.BaseSalesImpl = void 0;
+var _inventory = require("../../inventory");
 var _BaseModule = require("../../modules/BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -468,6 +469,40 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     order: undefined
   };
   otherParams = {};
+  getInventory() {
+    return this.otherParams.inventory;
+  }
+  async prepareCheckout(signal) {
+    const inventory = this.getInventory();
+    const hooks = this.otherParams.checkoutHooks;
+    if (!inventory && !hooks?.beforeCheckout) return undefined;
+    if (!this.store.order) throw new Error('Order module is not ready');
+    return this.store.order.prepareCheckout(async items => {
+      const assertCurrent = () => {
+        if (signal?.aborted) throw Object.assign(new Error('Checkout cancelled'), {
+          name: 'AbortError'
+        });
+        if (inventory !== this.getInventory() || hooks !== this.otherParams.checkoutHooks) throw (0, _inventory.salesGuardError)('The sales context changed. Please try again.');
+      };
+      assertCurrent();
+      try {
+        await hooks?.beforeCheckout?.({
+          items,
+          signal
+        });
+        if (inventory) await inventory.refresh({
+          reason: 'checkout',
+          force: true,
+          signal
+        });
+        assertCurrent();
+        return inventory?.freezeCheckout(items);
+      } catch (error) {
+        if (error?.name === 'AbortError') throw error;
+        throw (0, _inventory.salesGuardError)(error instanceof Error ? error.message : String(error));
+      }
+    });
+  }
   cacheId;
   /**
    * 由已在初始化阶段解析过设备短号的业务解决方案写入。
@@ -1235,12 +1270,35 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     return (0, _types2.createModule)(moduleName, this.name);
   }
+  inventoryOrderHooks;
   getSubModuleHooks(moduleName) {
     const optionHooks = this.initializeOptions.hooks || {};
     const otherHooks = this.otherParams.hooks || {};
     if (moduleName === 'order') {
       const directOrderHooks = optionHooks;
-      return optionHooks.order || this.otherParams.order?.hooks || otherHooks.order || (directOrderHooks.onBeforeMergeProductToOrder ? directOrderHooks : undefined);
+      const hooks = optionHooks.order || this.otherParams.order?.hooks || otherHooks.order || (directOrderHooks.onBeforeMergeProductToOrder || directOrderHooks.onBeforeCartCommit ? directOrderHooks : undefined);
+      const inventory = this.getInventory();
+      if (!inventory) {
+        this.inventoryOrderHooks = undefined;
+        return hooks;
+      }
+      if (this.inventoryOrderHooks?.inventory === inventory && this.inventoryOrderHooks.base === hooks) {
+        return this.inventoryOrderHooks.hooks;
+      }
+      const combined = {
+        ...hooks,
+        onBeforeCartCommit: async context => {
+          await hooks?.onBeforeCartCommit?.(context);
+          if (inventory !== this.getInventory()) throw (0, _inventory.salesGuardError)('The sales context changed. Please try again.');
+          inventory.validate(context.proposedItems, context.currentItems);
+        }
+      };
+      this.inventoryOrderHooks = {
+        inventory,
+        base: hooks,
+        hooks: combined
+      };
+      return combined;
     }
     return optionHooks[moduleName] || this.otherParams[moduleName]?.hooks || otherHooks[moduleName];
   }
@@ -1288,7 +1346,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       const nextSubModuleOtherParams = this.buildSubModuleOtherParams(moduleName);
       await targetModule.updateOtherParams(nextSubModuleOtherParams, {
         changedParams,
-        cover
+        cover,
+        ...(moduleName === 'order' ? {
+          hooks: this.getSubModuleHooks(moduleName)
+        } : {})
       });
     }));
   }
@@ -1437,7 +1498,17 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     return isChanged;
   }
-  async initialize(core, options = {}) {
+  initialization;
+
+  /** Hosts can await readiness without changing Core's synchronous registration API. */
+  whenInitialized() {
+    return this.initialization || Promise.reject(new Error('Sales module is not registered'));
+  }
+  initialize(core, options = {}) {
+    this.initialization = this.initializeSalesRuntime(core, options);
+    return this.initialization;
+  }
+  async initializeSalesRuntime(core, options = {}) {
     this.core = core;
     this.initializeOptions = options || {};
     this.paymentNumberDevicePrefix = null;
@@ -1494,17 +1565,19 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     this.serverOrderChangeUnsubscribe = null;
     this.paymentMethodsChangedUnsubscribe?.();
     this.paymentMethodsChangedUnsubscribe = null;
-    Object.keys(this.store).forEach(key => {
-      if (this.reusedSharedSubModuleNames.has(key)) return;
+    for (const key of Object.keys(this.store)) {
+      if (this.reusedSharedSubModuleNames.has(key)) continue;
       const sub = this.store[key];
       if (sub && typeof sub.destroy === 'function') {
         try {
-          sub.destroy();
+          // A host may register a replacement after destroy resolves. Wait for
+          // nested modules so their cleanup cannot unregister the replacement.
+          await sub.destroy();
         } catch (error) {
           console.warn(`[BaseSales] 子模块 ${key} 销毁失败`, error);
         }
       }
-    });
+    }
     this.currentSalesDetail = null;
     this.paymentNumberDevicePrefix = null;
     this.queuedServerOrderChanges = [];
@@ -2218,10 +2291,10 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     }
     await discountModule.setDiscountList(params.discountList);
   }
-  async scanPromotionCode(code, customerId) {
+  async scanPromotionCode(code, customerId, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      const raw = await this.store.order.scanCode(code, customerId);
+      const raw = await this.store.order.scanCode(code, customerId, options);
       if (raw.isAvailable) {
         await this.store.order.recalculateSummary({
           createIfMissing: true
@@ -3884,6 +3957,13 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
       });
     });
   }
+  setProductVoucherGroups(groups) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    this.store.order.setProductVoucherGroups(groups);
+  }
+  validateProductVoucherSelection() {
+    this.store.order?.validateProductVoucherSelection();
+  }
   async addProductToOrder(product, booking, options) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');

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

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

@@ -346,7 +346,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 客户状态

package/lib/solution/BookingTicket/index.js

@@ -30,6 +30,7 @@ var _handleScan = require("./utils/scan/handleScan");
 var _scanCache = _interopRequireDefault(require("./utils/scan/scanCache"));
 var _formatGlobalScan = require("./utils/scan/formatGlobalScan");
 var _applyGlobalScan = require("./utils/scan/applyGlobalScan");
+var _applyProductVoucherCollectionScan = require("./utils/scan/applyProductVoucherCollectionScan");
 var _cartView = require("./utils/cartView");
 var _addProductDecision = require("./utils/addProductDecision");
 var _buildCacheItemFromOrderLine = require("../../modules/BookingContext/utils/buildCacheItemFromOrderLine");
@@ -1672,6 +1673,20 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       };
     }
     try {
+      if (bridge?.scanScope === 'product-voucher') {
+        if (!bridge.applyPromotionCode) return {
+          status: 'failed',
+          reason: 'no_bridge'
+        };
+        const promotion = await bridge.applyPromotionCode(trimmed);
+        return promotion.isAccepted ?? promotion.isAvailable ? {
+          status: 'success',
+          kind: 'promotion'
+        } : {
+          status: 'failed',
+          reason: 'not_found'
+        };
+      }
       const localSearch = v => this.store.products.findProductsByCodeOrBarcode(v);
       const scanCallback = (0, _handleScan.handleGlobalScan)(this.request, localSearch, this.getSubmitOrderSalesChannel());
       const raw = await scanCallback({
@@ -1686,7 +1701,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
           reason: 'not_found'
         };
       }
-      const result = await (0, _applyGlobalScan.applyGlobalScan)({
+      const host = {
         setOrderCustomer: customer => this.setOrderCustomer(customer),
         getOrderCustomerSnapshot: () => this.getOrderCustomerSnapshot(),
         resolveCustomerById: customerId => this.resolveCustomerById(customerId),
@@ -1698,10 +1713,29 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         addProductToOrder: (product, booking) => this.addProductToOrder(product, booking),
         refreshWalletAssets: params => this.refreshWalletAssets(params),
         scanWalletAsset: scanCode => this.scanWalletAsset(scanCode)
-      }, formatted, bridge);
+      };
+      const result = bridge?.scanScope === 'product-voucher-collection' ? await (0, _applyProductVoucherCollectionScan.applyProductVoucherCollectionScan)({
+        ...host,
+        waitForCustomerDiscounts: () => this.orderCustomerDiscountRefreshInFlight || Promise.resolve(),
+        loadCustomerDiscounts: async () => {
+          const customerId = Number(this.getOrderCustomer()?.customer_id || 0);
+          if (customerId <= 1) return [];
+          await this.refreshDiscountConfigAfterOrderCustomerChange(customerId);
+          return this.getDiscountList();
+        }
+      }, formatted, bridge) : await (0, _applyGlobalScan.applyGlobalScan)(host, formatted, bridge);
       bridge?.refresh?.();
       return result;
     } catch (error) {
+      if (bridge?.scanScope === 'product-voucher-collection') {
+        if (bridge.isCurrent?.() === false) return {
+          status: 'cancelled'
+        };
+        return {
+          status: 'failed',
+          reason: 'entry_resolution_failed'
+        };
+      }
       console.error('[BookingTicket] handleGlobalScanCode failed', error);
       bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
       return {

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

@@ -208,6 +208,10 @@ export interface AddAddTimeProductsToBookingInput {
 }
 /** 扫码宿主桥接：SalesSdk 在 pubsub 订阅回调里注入，OS 需要 UI 时直接调用 */
 export interface GlobalScanHostBridge {
+    /** product-voucher handles voucher codes only; product-voucher-collection also resolves wallet customer vouchers. */
+    scanScope?: 'all' | 'product-voucher' | 'product-voucher-collection';
+    /** A one-shot entry may outlive its page while requests are in flight. */
+    isCurrent?: () => boolean;
     openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
     openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
     confirmDetail?: (input: {
@@ -232,11 +236,13 @@ export interface GlobalScanHostBridge {
      */
     applyPromotionCode?: (code: string, customerId?: number, options?: {
         suppressFailureNotification?: boolean;
+        productVouchersOnly?: boolean;
     }) => Promise<{
         isAvailable?: boolean;
         isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
+        scannedDiscountList?: Record<string, any>[];
     }>;
     /** 当前订单已有其他客户时，由宿主复用客户组件完成确认及切换。 */
     requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
@@ -244,7 +250,7 @@ export interface GlobalScanHostBridge {
     refresh?: () => void;
 }
 /** handleGlobalScanCode 结构化返回 */
-export type GlobalScanHandleResult = {
+export type GlobalScanHandleResult = ({
     status: 'success';
     kind: 'customer' | 'products' | 'promotion';
     meta?: {
@@ -257,5 +263,11 @@ export type GlobalScanHandleResult = {
     status: 'cancelled';
 } | {
     status: 'failed';
-    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge';
+    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge' | 'entry_resolution_failed';
+}) & {
+    /** product-voucher-collection returns voucher candidates; the caller decides how to use them. */
+    redemption?: {
+        source: 'wallet' | 'scan';
+        vouchers: Record<string, any>[];
+    };
 };

package/lib/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -5,7 +5,7 @@ import type { OrderProduct, OrderProductIdentity, AddProductBookingInput } from
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 export type AddProductDecision = {

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -17,12 +17,13 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _BookingContext = require("../../../modules/BookingContext");
 var _transformBaseProductToOrderProduct = require("../../BaseSales/utils/transformBaseProductToOrderProduct");
 var _weighingProductSku = require("./weighingProductSku");
+var _platform = require("../../../utils/platform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
  *
  * 1. `requiresDetail`：规格 / SKU / 套餐 / Session / 称重弹窗（门禁：`isOpenDetailModal` / `cartDetailValue` / `open_sold_weight`）
- * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（kiosk 强制进入；其他渠道由 `getIsAutoClose` 决定）
+ * 2. `requiresBookingEdit`：资源 / 时间编辑抽屉（自助终端强制进入；其他渠道由 `getIsAutoClose` 决定）
  * 3. `add`：两关均通过，直接 transform + 加车
  */
 
@@ -39,11 +40,11 @@ function needsSpecDetailModal(item) {
 }
 
 /**
- * 第二段：预约商品是否仍需打开资源 / 时间编辑（kiosk 强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
+ * 第二段：预约商品是否仍需打开资源 / 时间编辑（自助终端强制打开，其他渠道与 info2 `cacheItem.autoClose` 等价）。
  */
 function needsBookingEdit(cacheItem, ctx) {
   if (isNormalBookingProduct(cacheItem)) return false;
-  if (ctx?.channel === 'kiosk') return true;
+  if ((0, _platform.isSelfServicePlatform)(ctx?.channel)) return true;
   const isAutoAllocationOn = ctx?.isAutoAllocationOn || (() => true);
   return !(0, _BookingContext.getIsAutoClose)(cacheItem, isAutoAllocationOn);
 }

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -283,6 +283,18 @@ async function applyGlobalScan(host, formatted, bridge) {
     // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
     // 支付资产查询使用本店客户上下文。
     const bindResult = await bindWalletPassCustomer();
+    // Voucher collection prioritizes goods coupons resolved from the wristband/order.
+    // Only this opt-in flow checks them before selecting a payment wallet asset.
+    const collectionPromotion = bridge?.scanScope === 'product-voucher-collection' && bridge.applyPromotionCode ? await bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer), {
+      suppressFailureNotification: true,
+      productVouchersOnly: true
+    }) : undefined;
+    if (collectionPromotion?.isAccepted ?? collectionPromotion?.isAvailable) {
+      return {
+        status: 'success',
+        kind: 'promotion'
+      };
+    }
     const walletSelection = await trySelectWalletAsset();
     if (walletSelection) return walletSelection;
     if (!bridge?.applyPromotionCode) {
@@ -292,9 +304,9 @@ async function applyGlobalScan(host, formatted, bridge) {
       };
     }
     const promotionCustomerId = getRealCustomerId(activeCustomer);
-    const promotionResult = bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
+    const promotionResult = collectionPromotion ?? (bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
       suppressFailureNotification: true
-    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId);
+    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId));
     if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
       return {
         status: 'success',

package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts

@@ -0,0 +1,10 @@
+import type { GlobalScanHandleResult, GlobalScanHostBridge } from '../../types';
+import { type GlobalScanApplyHost } from './applyGlobalScan';
+import type { GlobalScanFormattedResult } from './formatGlobalScan';
+export interface ProductVoucherCollectionScanHost extends GlobalScanApplyHost {
+    waitForCustomerDiscounts(): Promise<void>;
+    loadCustomerDiscounts(): Promise<Record<string, any>[]>;
+}
+/** Collect voucher candidates after customer binding and coupon loading finish.
+ * Never expand a wristband's result to other orders of the same customer. */
+export declare function applyProductVoucherCollectionScan(host: ProductVoucherCollectionScanHost, formatted: GlobalScanFormattedResult, bridge: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;

package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyProductVoucherCollectionScan = applyProductVoucherCollectionScan;
+var _applyGlobalScan = require("./applyGlobalScan");
+/** Collect voucher candidates after customer binding and coupon loading finish.
+ * Never expand a wristband's result to other orders of the same customer. */
+async function applyProductVoucherCollectionScan(host, formatted, bridge) {
+  const assertCurrent = () => {
+    if (bridge.isCurrent?.() === false) {
+      throw new DOMException('Scan session ended', 'AbortError');
+    }
+  };
+  let vouchers = [];
+  assertCurrent();
+  const result = await (0, _applyGlobalScan.applyGlobalScan)({
+    ...host,
+    setOrderCustomer: customer => {
+      assertCurrent();
+      host.setOrderCustomer(customer);
+    },
+    addProductToOrder: (product, booking) => {
+      assertCurrent();
+      return host.addProductToOrder(product, booking);
+    }
+  }, formatted, {
+    ...bridge,
+    applyPromotionCode: bridge.applyPromotionCode && (async (code, customerId, options) => {
+      // Customer binding starts prepare/config in the background. Let it finish
+      // before adding scanned coupons so its response cannot overwrite them.
+      await host.waitForCustomerDiscounts();
+      assertCurrent();
+      const promotion = await bridge.applyPromotionCode(code, customerId, {
+        ...options,
+        productVouchersOnly: true,
+        suppressFailureNotification: true
+      });
+      assertCurrent();
+      // An empty successful search is different from a swallowed request error.
+      if (!Array.isArray(promotion.scannedDiscountList)) {
+        throw new Error('Could not resolve scanned vouchers');
+      }
+      vouchers = promotion.scannedDiscountList;
+      return promotion;
+    })
+  });
+  assertCurrent();
+  if (formatted.searchType === 'wallet' && result.status === 'success') {
+    vouchers = await host.loadCustomerDiscounts();
+    assertCurrent();
+    return {
+      ...result,
+      redemption: {
+        source: 'wallet',
+        vouchers
+      }
+    };
+  }
+  if (formatted.searchType === 'walletPass') {
+    return {
+      ...result,
+      redemption: {
+        source: 'scan',
+        vouchers
+      }
+    };
+  }
+  return result;
+}

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -10,6 +10,7 @@ exports.searchWalletPass = exports.searchWallet = exports.searchProduct = export
 const searchWalletPass = async (request, code) => {
   const params = {
     code,
+    resolve_ticket_order: 1,
     translate_flag: 1,
     // 翻译识别码名称 0:不翻译 1:翻译
     relation_product: 1,

package/lib/solution/BookingTicket/utils/scan/handleScan.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleUniversalScan = exports.handleGlobalScan = exports.handleCustomerScan = void 0;
 var _cloudSearch = require("./cloudSearch");
 var _scanCache = _interopRequireDefault(require("./scanCache"));
+var _platform = require("../../../../utils/platform");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Promise.any 的替代实现
@@ -107,7 +108,7 @@ const handleGlobalScan = (request, localSearch, channel) => {
     if (value.startsWith('WL')) {
       requestList = [(0, _cloudSearch.searchWallet)(request, value)];
     } else {
-      requestList = [...(channel === 'kiosk' ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
+      requestList = [...((0, _platform.isSelfServicePlatform)(channel) ? [] : [(0, _cloudSearch.searchOrder)(request, value)]), (0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
     }
     return requestList;
   };

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

@@ -127,7 +127,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * PC/H5 及自助终端结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
      * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;