@pisell/pisellos 0.10.40 → 0.10.41

package/lib/modules/Customer/index.js

@@ -153,7 +153,10 @@ class CustomerModule extends _BaseModule.BaseModule {
       ...(search && {
         search
       }),
-      ..._otherParams
+      ..._otherParams,
+      ...(url === '/customer/select-list' ? {
+        with_franchisor_data: 1
+      } : {})
     };
     const res = await this.request.get(url, queryParams, {
       cache: {

package/lib/modules/Customer/types.d.ts

@@ -50,6 +50,8 @@ export interface ShopGetCustomerListParams {
     search_wallet_flag?: 0 | 1;
     /** wallet pass搜索标识 */
     search_wallet_pass_flag?: 0 | 1;
+    /** 是否查询连锁加盟组合店铺数据 */
+    with_franchisor_data?: boolean | 0 | 1;
     /** 其他筛选参数 */
     [key: string]: any;
 }

package/lib/modules/Payment/types.d.ts

@@ -412,6 +412,8 @@ export interface WalletAssetsBehaviorOptions {
 export interface RefreshWalletAssetsOptions {
     /** 商品/金额变化默认保留并重验选择；客户变化由实现层强制清空。 */
     preserveSelection?: boolean;
+    /** 客户变化时，仅保留与本次扫码匹配的搜索结果；其他搜索缓存仍会清空。 */
+    retainSearchResultCodes?: string[];
 }
 export interface SelectWalletAssetOptions {
     selected: boolean;
@@ -419,6 +421,8 @@ export interface SelectWalletAssetOptions {
 }
 export interface ScanWalletAssetResult {
     type: SearchIdentificationCodeResult['type'];
+    /** walletCode 时保留完整 Wallet Detail，供客户解析与客户选择器使用。 */
+    data?: WalletDetailSearchData;
     asset?: any;
     selected: boolean;
     state: WalletAssetsState;
@@ -864,6 +868,8 @@ export interface SearchIdentificationCodeParams extends WalletDeductionRecommend
  * 搜索识别码响应数据
  */
 export interface SearchIdentificationCodeResponse {
+    /** 业务是否成功 */
+    status?: boolean;
     /** 响应状态码 */
     code?: number;
     /** 响应消息 */
@@ -871,12 +877,26 @@ export interface SearchIdentificationCodeResponse {
     /** 响应数据 */
     data?: SearchIdentificationCodeItem[];
 }
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
+export interface WalletDetailSearchData {
+    id?: string | number;
+    customer_id?: string | number;
+    customer?: Record<string, any> | null;
+    is_cross_shop_wallet?: boolean | 0 | 1;
+    [key: string]: any;
+}
+export interface WalletDetailSearchResponse {
+    status?: boolean;
+    code?: number;
+    message?: string;
+    data?: WalletDetailSearchData | null;
+}
 /**
  * 搜索识别码结果类型
  */
 export type SearchIdentificationCodeResult = {
     type: 'walletCode';
-    data: SearchIdentificationCodeItem[];
+    data: WalletDetailSearchData;
 } | {
     type: 'normalCode';
     data: SearchIdentificationCodeItem[];

package/lib/modules/Payment/types.js

@@ -221,6 +221,7 @@ let PaymentHooks = exports.PaymentHooks = /*#__PURE__*/function (PaymentHooks) {
 /**
  * 搜索识别码响应数据
  */
+/** Wallet code 精确搜索返回的 Wallet Detail。 */
 /**
  * 搜索识别码结果类型
  */

package/lib/modules/Payment/walletpass.d.ts

@@ -96,7 +96,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 搜索识别码信息
      * 通过识别码搜索相关的钱包通行证信息
      * 基于 WalletDeductionRecommendParams 参数结构
-     * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+     * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
      */
     searchIdentificationCodeAsync(params: SearchIdentificationCodeParams, config?: {
         noCache?: boolean;

package/lib/modules/Payment/walletpass.js

@@ -705,7 +705,7 @@ class WalletPassPaymentImpl {
    * 搜索识别码信息
    * 通过识别码搜索相关的钱包通行证信息
    * 基于 WalletDeductionRecommendParams 参数结构
-   * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
+   * 特殊逻辑：WL 或指定 200 格式的 Wallet Code 调用 /wallet/detail/search 接口。
    */
   async searchIdentificationCodeAsync(params, config = {}) {
     try {
@@ -725,6 +725,7 @@ class WalletPassPaymentImpl {
         const walletDetailParams = {
           code: code,
           with_customer: 1,
+          with_franchisor_data: 1,
           with: ['wallet']
         };
         this.paymentModule.logInfo('[WalletPass] 搜索钱包识别码', {
@@ -733,15 +734,18 @@ class WalletPassPaymentImpl {
           with: walletDetailParams.with
         });
         const response = await this.paymentModule.request.post('/wallet/detail/search', walletDetailParams);
-        const searchResults = response?.data || [];
+        const walletDetail = response?.data;
+        if (response?.status !== true || response?.code !== 200 || !walletDetail || typeof walletDetail !== 'object' || Array.isArray(walletDetail)) {
+          throw new Error(response?.message || 'Wallet detail search failed');
+        }
         this.paymentModule.logInfo('[WalletPass] 钱包识别码搜索完成', {
           code: code,
-          results_count: searchResults.length,
+          results_count: 1,
           type: 'walletCode'
         });
         return {
           type: 'walletCode',
-          data: searchResults
+          data: walletDetail
         };
       }
 
@@ -830,9 +834,16 @@ class WalletPassPaymentImpl {
     const previousCustomerId = this.walletAssetsState.customerId;
     const customerChanged = String(previousCustomerId ?? '') !== String(nextCustomerId ?? '');
     const preserveSelection = options.preserveSelection !== false && !customerChanged;
+    const retainedSearchCodeKeys = new Set((options.retainSearchResultCodes || []).map(normalizeWalletAssetCode).filter(Boolean));
+    const retainedSearchResults = customerChanged && retainedSearchCodeKeys.size > 0 ? this.searchResults.filter(item => isWalletPaymentAsset(item) && getWalletAssetCodeKeys(item).some(code => retainedSearchCodeKeys.has(code))) : [];
     if (customerChanged) {
       this.clearSearchResults();
+      if (retainedSearchResults.length > 0) {
+        this.searchResults = mergeWalletAssets(retainedSearchResults);
+        this.queuePendingAutoSelectForAssets(retainedSearchResults);
+      }
     }
+    const preserveSearchContext = preserveSelection || retainedSearchResults.length > 0;
     const committedKeys = new Set(this.walletAssetsState.committedIds.map(id => String(id)));
     const committedItems = this.walletAssetsState.items.filter(item => committedKeys.has(getWalletAssetKey(item)));
     const selectedIds = preserveSelection ? [...this.walletAssetsState.selectedIds] : [];
@@ -901,8 +912,8 @@ class WalletPassPaymentImpl {
       error: null
     });
     try {
-      const searchedWalletAssetCodes = preserveSelection ? this.getSearchedWalletAssetCodes() : [];
-      const useAggregateRecalculate = preserveSelection && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
+      const searchedWalletAssetCodes = preserveSearchContext ? this.getSearchedWalletAssetCodes() : [];
+      const useAggregateRecalculate = preserveSearchContext && (selectedIds.length > 0 || searchedWalletAssetCodes.length > 0);
       const aggregateResult = useAggregateRecalculate ? await this.aggregateRecalculateWalletAssetsAsync(businessData, selectedIds) : null;
       const result = aggregateResult || (await this.initializeWalletDataFromBusinessAsync(businessData));
       if (requestSequence !== this.walletAssetsRequestSequence) {
@@ -920,7 +931,7 @@ class WalletPassPaymentImpl {
           this.searchResults = this.searchResults.filter(item => !missingSelectedKeys.has(getWalletAssetKey(item)));
         }
       }
-      const searchedWalletAssets = preserveSelection ? this.syncSearchedWalletAssets([...(result.transformList || []), ...(result.noApplicableVoucher || [])]) : [];
+      const searchedWalletAssets = preserveSearchContext ? this.syncSearchedWalletAssets([...(result.transformList || []), ...(result.noApplicableVoucher || [])]) : [];
       if (requestSequence !== this.walletAssetsRequestSequence) {
         return this.getWalletAssetsState();
       }
@@ -1122,14 +1133,23 @@ class WalletPassPaymentImpl {
       code: normalizedCode,
       prepare_payments: this.formatWalletPassList2PreparePayments(this.walletAssetsState.selectedItems)
     });
+    if (result.type === 'walletCode') {
+      return {
+        type: 'walletCode',
+        data: result.data,
+        asset: result.data,
+        selected: false,
+        state: this.getWalletAssetsState()
+      };
+    }
     const paymentAssets = this.formatSearchedWalletPaymentAssets(result.data.filter(isWalletPaymentAsset));
     if (paymentAssets.length > 0) {
       this.searchResults = mergeWalletAssets(this.searchResults, paymentAssets);
     }
     const asset = paymentAssets.find(item => String(item?.code || '') === normalizedCode) || paymentAssets[0];
-    if (!asset || result.type === 'walletCode') {
+    if (!asset) {
       return {
-        type: result.type,
+        type: 'normalCode',
         asset,
         selected: false,
         state: this.getWalletAssetsState()

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

@@ -397,6 +397,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: {

package/lib/solution/BaseSales/index.js

@@ -3013,7 +3013,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;

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 | 1 | 2 | 5 | 6 | 3 | 4;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 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: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -33,6 +33,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;
     protected openDataTarget: string | null;
+    private readonly customerResolveRequests;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
      * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
@@ -78,10 +79,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。
      *

package/lib/solution/BookingTicket/index.js

@@ -164,6 +164,7 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   loadOpenDataInFlight = null;
   loadOpenDataInFlightTarget = null;
   openDataTarget = null;
+  customerResolveRequests = new Map();
 
   /**
    * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -442,7 +443,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({
@@ -493,43 +502,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);
@@ -547,9 +552,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。
@@ -1669,6 +1671,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),

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';

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

@@ -5,10 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.applyGlobalScan = applyGlobalScan;
 var _addProductDecision = require("../addProductDecision");
-var _cartView = require("../cartView");
 var _scanProductValues = require("./scanProductValues");
 /** applyGlobalScan 所需的 BookingTicket 运行时能力 */
 
+function getRealCustomerId(customer) {
+  const customerId = Number(customer?.id ?? customer?.customer_id);
+  return Number.isInteger(customerId) && customerId > 1 ? customerId : undefined;
+}
+function getWalletAssetCustomerId(asset) {
+  const customerId = Number(asset?.customer_id ?? asset?.holder?.customer_id);
+  return Number.isInteger(customerId) && customerId > 1 ? customerId : undefined;
+}
+function getErrorMessage(error) {
+  return error instanceof Error ? error.message : String(error || '');
+}
+
 /**
  * 处理单条扫码商品的加车决策（含弹窗链）。
  */
@@ -93,17 +104,55 @@ async function applyGlobalScan(host, formatted, bridge) {
   const {
     searchType,
     data,
-    scanCode
+    scanCode,
+    customerId: formattedCustomerId,
+    isCrossShopWallet
   } = formatted;
   if (searchType === 'wallet') {
-    if (!data) {
+    const currentCustomer = host.getOrderCustomerSnapshot();
+    if (getRealCustomerId(currentCustomer) !== undefined) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
+    }
+    let customer = data;
+    if (isCrossShopWallet) {
+      const sourceCustomerId = getRealCustomerId({
+        id: formattedCustomerId
+      });
+      if (sourceCustomerId === undefined || !host.resolveCustomerById) {
+        bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+      try {
+        customer = await host.resolveCustomerById(sourceCustomerId);
+      } catch (error) {
+        bridge?.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+    }
+    const customerId = getRealCustomerId(customer) ?? (!isCrossShopWallet ? getRealCustomerId({
+      id: formattedCustomerId
+    }) : undefined);
+    if (!customer || customerId === undefined) {
       bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
       return {
         status: 'failed',
         reason: 'invalid_data'
       };
     }
-    host.setOrderCustomer(data);
+    const orderCustomer = customer.id === undefined || customer.id === null ? {
+      ...customer,
+      id: customerId
+    } : customer;
+    host.setOrderCustomer(orderCustomer);
     bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
     return {
       status: 'success',
@@ -112,7 +161,58 @@ async function applyGlobalScan(host, formatted, bridge) {
   }
   if (searchType === 'walletPass') {
     const snapshot = host.getOrderCustomerSnapshot();
-    const scannedCustomerIsWalkIn = (0, _cartView.isWalkInCustomer)(data);
+    const currentCustomerIsWalkIn = getRealCustomerId(snapshot) === undefined;
+    let activeCustomer = snapshot;
+    const bindWalletPassCustomer = async asset => {
+      if (!currentCustomerIsWalkIn) {
+        return {
+          resolveFailed: false
+        };
+      }
+      const assetCustomerId = getWalletAssetCustomerId(asset) ?? getRealCustomerId({
+        id: formattedCustomerId
+      });
+      let customer = null;
+      if (assetCustomerId !== undefined) {
+        if (!host.resolveCustomerById) {
+          bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+          return {
+            resolveFailed: true
+          };
+        }
+        try {
+          customer = await host.resolveCustomerById(assetCustomerId);
+        } catch (error) {
+          console.warn('[GlobalScan] Wallet asset customer lookup failed', error);
+          bridge?.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+          return {
+            resolveFailed: true
+          };
+        }
+      }
+      const customerId = getRealCustomerId(customer);
+      if (!customer || customerId === undefined) {
+        if (assetCustomerId !== undefined) {
+          bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+        }
+        return {
+          resolveFailed: assetCustomerId !== undefined
+        };
+      }
+      const orderCustomer = customer.id === undefined || customer.id === null ? {
+        ...customer,
+        id: customerId
+      } : customer;
+      host.setOrderCustomer(orderCustomer);
+      activeCustomer = orderCustomer;
+      await host.refreshWalletAssets?.({
+        preserveSelection: false,
+        retainSearchResultCodes: [scanCode]
+      });
+      return {
+        resolveFailed: false
+      };
+    };
     const trySelectWalletAsset = async () => {
       if (!host.scanWalletAsset) return null;
       const walletResult = await host.scanWalletAsset(scanCode).catch(error => {
@@ -123,61 +223,46 @@ async function applyGlobalScan(host, formatted, bridge) {
       if (walletResult.type !== 'normalCode' || !walletResult.asset) {
         return null;
       }
+      const bindResult = await bindWalletPassCustomer(walletResult.asset);
       if (walletResult.selected) {
-        bridge?.onNotify?.('success');
+        if (!bindResult.resolveFailed) {
+          bridge?.onNotify?.('success');
+        }
         return {
           status: 'success',
           kind: 'promotion'
         };
       }
       // 已识别为 Wallet 支付资产但当前不可用：保留禁用展示，不回退优惠码。
-      bridge?.onNotify?.('fail', 'pisell2.text.goodpass.code-invalid-cart');
+      if (!bindResult.resolveFailed) {
+        bridge?.onNotify?.('fail', 'pisell2.text.goodpass.code-invalid-cart');
+      }
       return {
         status: 'failed',
         reason: 'invalid_data'
       };
     };
-    if ((0, _cartView.isWalkInCustomer)(snapshot) || scannedCustomerIsWalkIn) {
-      // 当前购物车或 walletPass 绑定客户为 walk-in 时不绑客户，避免覆盖已有下单客户。
-      const walletSelection = await trySelectWalletAsset();
-      if (walletSelection) return walletSelection;
-      if (!bridge?.applyPromotionCode) {
-        return {
-          status: 'failed',
-          reason: 'no_bridge'
-        };
-      }
-      const result = await bridge.applyPromotionCode(scanCode);
-      if (result?.isAccepted ?? result?.isAvailable) {
-        return {
-          status: 'success',
-          kind: 'promotion'
-        };
-      }
+    const walletSelection = await trySelectWalletAsset();
+    if (walletSelection) return walletSelection;
+
+    // 非支付类 Wallet Pass 仍可能由 batch-search 返回所属客户。
+    await bindWalletPassCustomer();
+    if (!bridge?.applyPromotionCode) {
       return {
         status: 'failed',
-        reason: 'invalid_data'
+        reason: 'no_bridge'
       };
     }
-    host.setOrderCustomer(data);
-    await host.refreshWalletAssets?.({
-      preserveSelection: false
-    });
-    const walletSelection = await trySelectWalletAsset();
-    if (walletSelection) return walletSelection;
-    if (bridge?.applyPromotionCode) {
-      const promotionResult = await bridge.applyPromotionCode(scanCode, Number(data?.id ?? data?.customer_id) || undefined);
-      if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
-        return {
-          status: 'success',
-          kind: 'promotion'
-        };
-      }
+    const promotionResult = await bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer));
+    if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
+      return {
+        status: 'success',
+        kind: 'promotion'
+      };
     }
-    bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
     return {
-      status: 'success',
-      kind: 'customer'
+      status: 'failed',
+      reason: 'invalid_data'
     };
   }
   if (searchType === 'product' || searchType === 'local_product') {

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

@@ -14,6 +14,7 @@ const searchWalletPass = async (request, code) => {
     // 翻译识别码名称 0:不翻译 1:翻译
     relation_product: 1,
     // 组装关联商品: 0不处理 1处理
+    with_franchisor_data: 1,
     with: ['customer'],
     tags: ['point_card',
     // 积分卡
@@ -51,17 +52,18 @@ exports.searchWalletPass = searchWalletPass;
 const searchWallet = async (request, code) => {
   const params = {
     code,
-    with_customer: 1
+    with_customer: 1,
+    with_franchisor_data: 1
   };
   try {
     const res = await request?.post('/wallet/detail/search', params);
-    if (res?.code == 200 && !!res?.data) {
+    if (res?.status === true && res?.code === 200 && !!res?.data) {
       return {
         searchType: 'wallet',
         response: res
       };
     }
-    throw new Error('没有找到对应的识别码');
+    throw new Error(res?.message || '没有找到对应的识别码');
   } catch (error) {
     throw error;
   }

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

@@ -6,6 +6,10 @@ export interface GlobalScanFormattedResult {
     searchType: GlobalScanSearchType;
     data: any;
     scanCode: string;
+    /** Wallet / Wallet Pass 来源客户 ID；跨店时必须先解析为当前店客户。 */
+    customerId?: string | number;
+    /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
+    isCrossShopWallet?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;