@pisell/pisellos 2.2.308 → 2.2.310

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformBaseProductToOrderProduct = transformBaseProductToOrderProduct;
+var _weighedProduct = require("../../../modules/Order/utils/weighedProduct");
 var _utils = require("../../../modules/Order/utils");
 var _manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
@@ -65,11 +66,11 @@ function appendDataVariantIds(base, ...values) {
   }
   return Array.isArray(base) || result.length ? result : undefined;
 }
-function normalizeOptionItems(optionItems) {
+function normalizeOptionItems(optionItems, useOriginalPrice = false) {
   if (!Array.isArray(optionItems)) return [];
   return optionItems.map(optionItem => {
     const optionGroupItemId = toNumber(optionItem?.option_group_item_id ?? optionItem?.id);
-    const price = optionItem?.price ?? optionItem?.add_price ?? 0;
+    const price = (useOriginalPrice ? optionItem?.original_price : undefined) ?? optionItem?.price ?? optionItem?.add_price ?? 0;
     return {
       ...optionItem,
       option_group_item_id: optionGroupItemId,
@@ -80,10 +81,12 @@ function normalizeOptionItems(optionItems) {
     };
   });
 }
-function normalizeBundleItems(bundleItems, preferPriceField = false) {
+function normalizeBundleItems(bundleItems, preferPriceField = false, preferBundleSellingPrice = false) {
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(bundleItem => {
-    const unitSelling = preferPriceField ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
+    // Weighed manual prices distribute the bundle base and nested options separately.
+    // Its explicit selling amount already includes those options.
+    const unitSelling = preferPriceField && !preferBundleSellingPrice ? bundleItem.price ?? bundleItem.bundle_selling_price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0' : bundleItem.bundle_selling_price ?? bundleItem.price ?? bundleItem.custom_price ?? bundleItem.product_price ?? '0';
     const unitStr = toPriceString(unitSelling, '0.00');
     const num = toSafePositiveInt(bundleItem?.num ?? bundleItem?.quantity, 1);
     const magnitudeSource = {
@@ -147,19 +150,25 @@ function transformBaseProductToOrderProduct(params) {
   const productionCode = normalizeProductionCode(Object.prototype.hasOwnProperty.call(payload, 'production_code') ? payload.production_code : productVariantId > 0 ? matchedVariant?.production_code : origin?.production_code ?? sourceProduct?.production_code);
   const hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
-  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
+  // 称重商品使用改价前净重金额；其它商品从商品/variant 快照读取目录价。
+  // 售价仍由 line_total - bundle 推导。
   const catalogSourcePrice = matchedVariant?.price ?? matchedVariant?.base_price ?? origin?.price ?? origin?.base_price ?? sourceProduct?.price ?? sourceProduct?.selling_price ?? sourceProduct?.base_price;
-  const sourceProductPrice = toPriceString(hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice, '0.00');
+  const weighedSourcePrice = (0, _weighedProduct.resolveWeighedSourcePrice)(payload.product_sku ?? origin.product_sku, payload._extend?.weighing ?? origin._extend?.weighing);
+  const sourceProductPrice = toPriceString(weighedSourcePrice ?? (hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice), '0.00');
   const explicitLineTotal = payload.line_total ?? payload.total ?? payload._extend?.total;
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item));
-  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride);
+  const productOptionItem = (0, _utils.normalizeProductSkuOptions)(normalizeOptionItems(payload.product_sku?.option ?? payload.option ?? payload.options ?? payload.product_option_item, hasPriceOverride || weighedSourcePrice !== undefined));
+  const productBundle = normalizeBundleItems(payload.bundle ?? payload.product_bundle, hasPriceOverride, hasPriceOverride && weighedSourcePrice !== undefined);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；
   // 行级唯一值只接受显式协议字段，缺省交给 OrderModule 生成。
   const uniqueIdentificationNumber = payload.unique_identification_number;
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
-  const originTotal = (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
+  const originTotal = weighedSourcePrice !== undefined ? Number((0, _utils.composeLinePrice)({
+    mainPrice: Number(weighedSourcePrice) + (0, _utils.sumOptionUnitPrice)(productOptionItem).toNumber(),
+    bundle: hasPriceOverride ? (0, _weighedProduct.withOriginalBundleOptionPrices)(productBundle) : productBundle,
+    useOriginalBundle: true
+  })) : (0, _manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
     extendOriginTotal: payload._extend?.origin_total,
     originExtendOriginTotal: origin?._extend?.origin_total,
@@ -260,6 +269,12 @@ function transformBaseProductToOrderProduct(params) {
     product_cover: firstNonBlank(matchedVariant?.cover, sourceProduct?.cover),
     _origin: {
       ...(sourceProduct || {}),
+      ...(weighedSourcePrice !== undefined && hasPriceOverride ? {
+        _extend: {
+          ...sourceProduct?._extend,
+          origin_total: originTotal
+        }
+      } : {}),
       callbackData: payload
     }
   };

package/lib/solution/BaseSales/utils.js

@@ -8,6 +8,7 @@ exports.createEmptySummary = createEmptySummary;
 exports.getSafeProductNum = getSafeProductNum;
 exports.isSkuOnlyDeleteIdentity = isSkuOnlyDeleteIdentity;
 exports.normalizeOrderProduct = normalizeOrderProduct;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
 var _manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
@@ -237,7 +238,7 @@ function normalizeOrderProduct(product) {
   });
   const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadata) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({

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。
      *
@@ -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 的加时商品行。

package/lib/solution/BookingTicket/index.js

@@ -160,7 +160,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   addTimeProductsCatalog = [];
   orderCustomerDiscountRefreshInFlight = null;
   orderCustomerDiscountRefreshCustomerId = null;
+  orderCustomerDiscountRefreshTarget = null;
   orderCustomerPromotionRefreshInFlight = null;
+  customerResolveRequests = new Map();
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
   openDataTarget = null;
@@ -193,10 +195,37 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       throw new Error('bookingTicket解决方案需要 request 插件支持');
     }
     this.platform = this.otherParams?.platform;
+    await this.prepareInvoiceTemplateAtSolutionReady(this.getInjectedOpenDataConfig());
     await this.configureIdGeneratorFromOpenData();
   }
+  getInjectedOpenDataConfig() {
+    const openData = this.otherParams?.openData;
+    return openData && typeof openData === 'object' && !Array.isArray(openData) ? openData : undefined;
+  }
+
+  /**
+   * 在解决方案对外 ready 前准备 Invoice Document；失败只降级模板，不阻断销售。
+   * 已由页面取得的 OpenData 直接交给模块接管，没有注入数据时再走 target-scoped 加载。
+   */
+  async prepareInvoiceTemplateAtSolutionReady(injectedOpenData) {
+    const businessCode = this.getBookingTicketBusinessCode();
+    if (!businessCode || !this.store.openData) return;
+    const channel = this.getSubmitOrderSalesChannel();
+    const target = `${businessCode}+${channel}`;
+    try {
+      if (injectedOpenData && typeof this.store.openData.ensureInvoiceTemplateSettings === 'function') {
+        this.openDataTarget = target;
+        await this.store.openData.ensureInvoiceTemplateSettings(target, injectedOpenData);
+        this.otherParams.openData = injectedOpenData;
+        return;
+      }
+      await this.loadOpenDataConfig();
+    } catch (error) {
+      console.warn('[BookingTicket] Invoice 模板预加载失败，使用默认配置', error);
+    }
+  }
   getBookingTicketBusinessCode() {
-    const candidates = [this.otherParams?.businessCode, this.otherParams?.business_code, this.getOrderHeader()?.business_code, this.store.order?.getTempOrder()?.business_code, this.getSalesOrder()?.raw?.business_code];
+    const candidates = [this.otherParams?.businessCode, this.otherParams?.business_code, this.getOrderHeader()?.business_code, typeof this.store.order?.getTempOrder === 'function' ? this.store.order.getTempOrder()?.business_code : undefined, this.getSalesOrder()?.raw?.business_code];
     for (const candidate of candidates) {
       if (candidate === undefined || candidate === null) continue;
       const normalized = String(candidate).trim();
@@ -415,7 +444,15 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
 
     // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
     if (!hasOrderCustomer && extractedCustomerId && !isUserPlatform) {
-      await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+      try {
+        await this.hydrateOrderCustomerFromScanDiscounts(scannedList);
+      } catch (error) {
+        // 客户映射失败不能阻断原有 Pass 的可用性、展示或优惠处理。
+        console.warn('[BookingTicket] scan discount customer resolve failed', {
+          customerId: extractedCustomerId,
+          error
+        });
+      }
     }
     if (raw.isAvailable) {
       await this.store.order.recalculateSummary({
@@ -466,43 +503,39 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     return null;
   }
   async resolveCustomerById(customerId) {
-    const localCustomers = this.store.customer.getCustomers();
-    const localCustomer = this.findCustomerById(localCustomers, customerId);
-    const normalizedLocalCustomer = localCustomer ? this.normalizeCustomer(localCustomer) : null;
-    if (normalizedLocalCustomer && this.hasUsableCustomerDetails(normalizedLocalCustomer)) {
-      return normalizedLocalCustomer;
-    }
-    const result = await this.store.customer.queryCustomerList({
-      ids: [customerId],
-      skip: 1,
-      num: 1
-    });
-    const remoteCustomer = this.findCustomerById(result?.list || [], customerId) || result?.list?.[0] || null;
-    if (remoteCustomer) {
-      return this.normalizeCustomer(remoteCustomer);
-    }
-    try {
-      const detailCustomer = await this.store.customer.queryCustomerDetail(customerId);
-      return detailCustomer ? this.normalizeCustomer(detailCustomer) : null;
-    } catch (error) {
-      console.warn('[BookingTicket] resolveCustomerById detail request failed', {
-        customerId,
-        error
-      });
+    const rawCustomerId = String(customerId ?? '').trim();
+    const numericCustomerId = Number(rawCustomerId);
+    if (!rawCustomerId || !Number.isInteger(numericCustomerId) || numericCustomerId <= 1) {
       return null;
     }
+    const normalizedCustomerId = String(numericCustomerId);
+    const existingRequest = this.customerResolveRequests.get(normalizedCustomerId);
+    if (existingRequest) return existingRequest;
+    const request = this.request.post(`/customer/resolve/${encodeURIComponent(normalizedCustomerId)}`, {
+      with_franchisor_data: 1,
+      with: ['latestWalletDetail.wallet', 'contactsInfo', 'formRecord']
+    }).then(result => {
+      const customer = result?.data;
+      const resolvedCustomerId = Number(customer && typeof customer === 'object' && !Array.isArray(customer) ? this.getRawCustomerId(customer) : NaN);
+      if (result?.status !== true || result?.code !== 200 || !customer || typeof customer !== 'object' || Array.isArray(customer) || !Number.isInteger(resolvedCustomerId) || resolvedCustomerId <= 1) {
+        const error = new Error(result?.message || 'Customer resolve failed');
+        error.code = result?.code;
+        throw error;
+      }
+      return this.normalizeCustomer(customer);
+    }).finally(() => {
+      if (this.customerResolveRequests.get(normalizedCustomerId) === request) {
+        this.customerResolveRequests.delete(normalizedCustomerId);
+      }
+    });
+    this.customerResolveRequests.set(normalizedCustomerId, request);
+    return request;
   }
 
   /** 兼容既有优惠码扫码逻辑。 */
   resolveCustomerByDiscountCustomerId(customerId) {
     return this.resolveCustomerById(customerId);
   }
-  findCustomerById(customers = [], customerId) {
-    return customers.find(customer => {
-      const rawId = this.getRawCustomerId(customer);
-      return rawId !== null && String(rawId) === String(customerId);
-    }) || null;
-  }
   normalizeCustomer(customer) {
     const raw = customer;
     const rawId = this.getRawCustomerId(customer);
@@ -520,9 +553,6 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     const raw = customer;
     return customer.id ?? raw.customer_id ?? raw.customerId ?? null;
   }
-  hasUsableCustomerDetails(customer) {
-    return !!(customer.name || customer.phone || customer.email || customer.display_name || customer.customer_name);
-  }
 
   /**
    * 更新当前预约的 appointment_status。
@@ -1094,7 +1124,13 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   }
   refreshDiscountConfigAfterOrderCustomerChange(customerId) {
     if (!customerId || customerId === 1) return Promise.resolve();
-    if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
+    const tempOrder = this.store.order.getTempOrder?.();
+    const orderIdentity = this.getOrderIdentity?.();
+    const orderId = tempOrder?.order_id || orderIdentity?.orderId;
+    const action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+    const orderTarget = orderId ? `order:${String(orderId)}` : `external:${String(tempOrder?.external_sale_number || orderIdentity?.externalSaleNumber || orderIdentity?.localId || 'new')}`;
+    const refreshTarget = `${customerId}:${action}:${orderTarget}`;
+    if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshTarget === refreshTarget) {
       return this.orderCustomerDiscountRefreshInFlight;
     }
     const previousRefresh = this.orderCustomerDiscountRefreshInFlight;
@@ -1106,22 +1142,33 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       if (!currentCustomer || Number(currentCustomer.customer_id) !== customerId) {
         return;
       }
-      const tempOrder = this.store.order.getTempOrder?.();
-      const orderId = tempOrder?.order_id || this.getOrderIdentity?.()?.orderId;
-      const action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+      const currentTempOrder = this.store.order.getTempOrder?.();
+      const currentOrderIdentity = this.getOrderIdentity?.();
+      const currentOrderId = currentTempOrder?.order_id || currentOrderIdentity?.orderId;
+      const currentAction = !currentOrderId || String(currentOrderId).startsWith('local_order') ? 'create' : 'edit';
+      const currentOrderTarget = currentOrderId ? `order:${String(currentOrderId)}` : `external:${String(currentTempOrder?.external_sale_number || currentOrderIdentity?.externalSaleNumber || currentOrderIdentity?.localId || 'new')}`;
+      if (`${customerId}:${currentAction}:${currentOrderTarget}` !== refreshTarget) {
+        return;
+      }
+
+      // 上一个订单的迟到请求可能在客户切换后重新写入 BaseSales cache key；
+      // 客户变更触发的目标订单刷新必须绕过该缓存。
       await this.loadDiscountConfig({
         customerId,
-        action
+        action,
+        force: true
       });
     })();
     this.orderCustomerDiscountRefreshInFlight = refreshTask;
     this.orderCustomerDiscountRefreshCustomerId = customerId;
+    this.orderCustomerDiscountRefreshTarget = refreshTarget;
     refreshTask.catch(error => {
       console.error('Failed to load discount config after customer change:', error);
     }).finally(() => {
       if (this.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
       this.orderCustomerDiscountRefreshInFlight = null;
       this.orderCustomerDiscountRefreshCustomerId = null;
+      this.orderCustomerDiscountRefreshTarget = null;
     });
     return refreshTask;
   }
@@ -1642,6 +1689,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       const result = await (0, _applyGlobalScan.applyGlobalScan)({
         setOrderCustomer: customer => this.setOrderCustomer(customer),
         getOrderCustomerSnapshot: () => this.getOrderCustomerSnapshot(),
+        resolveCustomerById: customerId => this.resolveCustomerById(customerId),
         getBusinessCode: () => this.otherParams?.businessCode,
         buildAddProductCtx: extra => this.buildAddProductCtx(extra),
         decideAddProduct: (item, options) => this.decideAddProduct(item, options),
@@ -1662,6 +1710,18 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       };
     }
   }
+
+  /** 查询码类型；复用原有识别和缓存，不写订单、不打开选择 UI。 */
+  async getGlobalScanCodeType(code) {
+    const trimmed = typeof code === 'string' ? code.trim() : '';
+    if (!trimmed) return null;
+    const scan = (0, _handleScan.handleGlobalScan)(this.request, value => this.store.products.findProductsByCodeOrBarcode(value), this.getSubmitOrderSalesChannel());
+    const raw = await scan({
+      type: 'nativeScanner',
+      value: trimmed
+    });
+    return (0, _formatGlobalScan.formatGlobalScanResult)(raw, trimmed)?.searchType ?? null;
+  }
   resolveBestAddTimePlan(addTimeProducts, targetMinutes) {
     return (0, _resolveBestAddTimePlan.resolveBestAddTimePlan)(addTimeProducts, targetMinutes);
   }
@@ -1784,10 +1844,12 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     await super.setOtherParams(params, {
       cover
     });
+    const invoiceContextChanged = params?.businessCode !== undefined || params?.business_code !== undefined || params?.channel !== undefined || params?.platform !== undefined || Object.prototype.hasOwnProperty.call(params, 'openData');
+    if (invoiceContextChanged) {
+      await this.prepareInvoiceTemplateAtSolutionReady(Object.prototype.hasOwnProperty.call(params, 'openData') ? this.getInjectedOpenDataConfig() : undefined);
+    }
     if (params?.businessCode !== undefined || params?.business_code !== undefined) {
       await this.configureIdGeneratorFromOpenData();
-    } else if (params?.channel !== undefined) {
-      await this.loadOpenDataConfig();
     }
   }
   getDeviceTaskPlugin() {

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

@@ -230,12 +230,16 @@ export interface GlobalScanHostBridge {
     /**
      * walk-in 扫 walletPass：直接核销优惠码（对齐 SaleDetail Voucher.handleApplyCode / cart.scanCode）。
      */
-    applyPromotionCode?: (code: string, customerId?: number) => Promise<{
+    applyPromotionCode?: (code: string, customerId?: number, options?: {
+        suppressFailureNotification?: boolean;
+    }) => Promise<{
         isAvailable?: boolean;
         isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
     }>;
+    /** 当前订单已有其他客户时，由宿主复用客户组件完成确认及切换。 */
+    requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
     onNotify?: (type: 'success' | 'fail' | 'info', messageKey?: string) => void;
     refresh?: () => void;
 }

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

@@ -5,6 +5,7 @@ import { GlobalScanFormattedResult } from './formatGlobalScan';
 export interface GlobalScanApplyHost {
     setOrderCustomer(customer: ICustomer | null): void;
     getOrderCustomerSnapshot(): ICustomer | null;
+    resolveCustomerById?(customerId: string | number): Promise<ICustomer | null>;
     getBusinessCode(): string | undefined;
     buildAddProductCtx(extra?: Record<string, any>): Record<string, any>;
     decideAddProduct(item: any, options?: Record<string, any>): AddProductDecision;
@@ -26,6 +27,7 @@ export interface GlobalScanApplyHost {
     addProductToOrder(product: any, booking?: any): Promise<any>;
     refreshWalletAssets?(params?: {
         preserveSelection?: boolean;
+        retainSearchResultCodes?: string[];
     }): Promise<any>;
     scanWalletAsset?(code: string): Promise<{
         type: 'walletCode' | 'normalCode';