@pisell/pisellos 2.2.309 → 2.2.311

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

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,81 @@ async function applyGlobalScan(host, formatted, bridge) {
   const {
     searchType,
     data,
-    scanCode
+    scanCode,
+    customerId: formattedCustomerId,
+    isCrossShopWallet,
+    isWalletPassUnavailableAtStore
   } = formatted;
   if (searchType === 'wallet') {
-    if (!data) {
+    const currentCustomer = host.getOrderCustomerSnapshot();
+    const currentCustomerId = getRealCustomerId(currentCustomer);
+    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;
+    if (currentCustomerId === customerId) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
+    }
+    if (currentCustomerId !== undefined) {
+      // 未接入新桥接的宿主保持原行为：已有客户时不直接覆盖。
+      if (!bridge?.requestCustomerSwitch) {
+        return {
+          status: 'success',
+          kind: 'customer'
+        };
+      }
+      try {
+        const switched = await bridge.requestCustomerSwitch(orderCustomer);
+        return switched ? {
+          status: 'success',
+          kind: 'customer'
+        } : {
+          status: 'cancelled'
+        };
+      } catch (error) {
+        bridge.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+    }
+    host.setOrderCustomer(orderCustomer);
     bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
     return {
       status: 'success',
@@ -111,8 +186,70 @@ async function applyGlobalScan(host, formatted, bridge) {
     };
   }
   if (searchType === 'walletPass') {
+    if (isWalletPassUnavailableAtStore) {
+      bridge?.onNotify?.('fail', 'pisell2.text.wallet-pass-not-available-at-store');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
     const snapshot = host.getOrderCustomerSnapshot();
-    const scannedCustomerIsWalkIn = (0, _cartView.isWalkInCustomer)(data);
+    let activeCustomer = snapshot;
+    const bindWalletPassCustomer = async asset => {
+      if (getRealCustomerId(activeCustomer) !== undefined) {
+        return {
+          resolveFailed: false,
+          customerBound: 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,
+            customerBound: false
+          };
+        }
+        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,
+            customerBound: false
+          };
+        }
+      }
+      const customerId = getRealCustomerId(customer);
+      if (!customer || customerId === undefined) {
+        if (assetCustomerId !== undefined) {
+          bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+        }
+        return {
+          resolveFailed: assetCustomerId !== undefined,
+          customerBound: false
+        };
+      }
+      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,
+        customerBound: true
+      };
+    };
     const trySelectWalletAsset = async () => {
       if (!host.scanWalletAsset) return null;
       const walletResult = await host.scanWalletAsset(scanCode).catch(error => {
@@ -123,61 +260,56 @@ 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'
-        };
-      }
+
+    // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
+    // 支付资产查询使用本店客户上下文。
+    const bindResult = await bindWalletPassCustomer();
+    const walletSelection = await trySelectWalletAsset();
+    if (walletSelection) return walletSelection;
+    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 promotionCustomerId = getRealCustomerId(activeCustomer);
+    const promotionResult = bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
+      suppressFailureNotification: true
+    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId);
+    if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
+      return {
+        status: 'success',
+        kind: 'promotion'
+      };
+    }
+    if (bindResult.customerBound) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
     }
-    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,7 +14,8 @@ const searchWalletPass = async (request, code) => {
     // 翻译识别码名称 0:不翻译 1:翻译
     relation_product: 1,
     // 组装关联商品: 0不处理 1处理
-    with: ['customer'],
+    with_franchisor_data: 1,
+    with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
     tags: ['point_card',
     // 积分卡
     'gift_card',
@@ -25,6 +26,8 @@ const searchWalletPass = async (request, code) => {
     // 折扣卡
     'good_pass',
     // 商品券
+    'entitlement_pass',
+    // 月卡 / 年卡 / 多次使用卡
     'session_ticket',
     // 场次票
     'appointment_ticket' // 预约类门票
@@ -51,17 +54,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,12 @@ export interface GlobalScanFormattedResult {
     searchType: GlobalScanSearchType;
     data: any;
     scanCode: string;
+    /** Wallet / Wallet Pass 来源客户 ID；跨店时必须先解析为当前店客户。 */
+    customerId?: string | number;
+    /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
+    isCrossShopWallet?: boolean;
+    /** 总店 Wallet Pass 未共享给当前子店。 */
+    isWalletPassUnavailableAtStore?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;

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

@@ -36,14 +36,22 @@ function formatGlobalScanResult(raw, scanCode) {
     return {
       searchType,
       data: resultData?.customer,
-      scanCode
+      scanCode,
+      customerId: resultData?.customer_id,
+      isCrossShopWallet: resultData?.is_cross_shop_wallet === true || Number(resultData?.is_cross_shop_wallet) === 1
     };
   }
   if (searchType === 'walletPass') {
+    const firstResult = resultData?.[0];
+    const isWalletPassUnavailableAtStore = firstResult?.is_franchisor_pass === 1 && firstResult?.franchisee_wallet_pass?.use !== 'enabled';
     return {
       searchType,
-      data: resultData?.[0]?.customer,
-      scanCode
+      data: firstResult?.customer,
+      scanCode,
+      customerId: firstResult?.customer_id ?? firstResult?.holder?.customer_id ?? firstResult?.customer?.id ?? firstResult?.customer?.customer_id,
+      ...(isWalletPassUnavailableAtStore ? {
+        isWalletPassUnavailableAtStore: true
+      } : {})
     };
   }
   if (searchType === 'product' || searchType === 'local_product') {

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

@@ -43,6 +43,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";
@@ -62,6 +63,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
+        with_entitlement_pass?: 0 | 1;
     }): Promise<void>;
 }
 export default ShopDiscountImpl;