@pisell/pisellos 0.10.39 → 0.10.41

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;

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

@@ -36,14 +36,18 @@ 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];
     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
     };
   }
   if (searchType === 'product' || searchType === 'local_product') {

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

@@ -123,8 +123,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+     * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+     * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/lib/solution/UnifiedBookingSales/index.js

@@ -1522,14 +1522,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   }
 
   /**
-   * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
-   * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
+   * PC/H5/Kiosk 结账默认直接等待云端 checkout；POS/WebPOS 仍保持本地待同步。
+   * 显式传 checkoutSyncTaskEnabled: true 时仍可回退到本地同步模式。
    */
   shouldUseCheckoutSyncTask() {
     const configured = this.otherParams?.checkoutSyncTaskEnabled;
     if (configured === true) return true;
-    const platform = (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform);
-    return platform !== 'h5' && platform !== 'kiosk';
+    const platform = String(this.otherParams?.platform ?? '').trim().toLowerCase();
+    return !(0, _platform.isCustomerUserPlatform)(platform) && platform !== 'kiosk';
   }
 
   /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.39",
+  "version": "0.10.41",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",