@pisell/pisellos 0.0.568 → 0.0.569

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

@@ -0,0 +1,220 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyGlobalScan = applyGlobalScan;
+var _addProductDecision = require("../addProductDecision");
+var _cartView = require("../cartView");
+var _scanProductValues = require("./scanProductValues");
+/** applyGlobalScan 所需的 BookingTicket 运行时能力 */
+
+/**
+ * 处理单条扫码商品的加车决策（含弹窗链）。
+ */
+async function processScannedProductItem(host, item, code, bridge) {
+  const ctx = host.buildAddProductCtx();
+  if ((0, _scanProductValues.isScanProductBundle)(item) || (0, _scanProductValues.isScanProductOption)(item)) {
+    return runRequiresDetailFlow(host, item, ctx, bridge);
+  }
+  if ((0, _scanProductValues.countScanVariantMatches)(item, code) >= 2) {
+    return runRequiresDetailFlow(host, item, ctx, bridge);
+  }
+  const values = (0, _scanProductValues.genScanProductValues)(item, code);
+  const itemWithSelection = {
+    ...item,
+    cartDetailValue: values
+  };
+  const decision = host.decideAddProduct(itemWithSelection, ctx);
+  return runAddProductDecision(host, item, decision, ctx, bridge);
+}
+async function runRequiresDetailFlow(host, item, ctx, bridge) {
+  if (!bridge?.openProductDetail) {
+    return 'pending';
+  }
+  const payload = (0, _addProductDecision.buildRequiresDetailPayload)(item, ctx);
+  const detailResult = await bridge.openProductDetail(payload);
+  if (!detailResult) {
+    return 'cancelled';
+  }
+  if (!bridge.confirmDetail) {
+    return 'pending';
+  }
+  await bridge.confirmDetail({
+    item: payload.productData ?? payload.item ?? item,
+    detailResult
+  });
+  return 'added';
+}
+async function runAddProductDecision(host, catalogItem, decision, ctx, bridge) {
+  if (decision.action === 'reloadCatalog') {
+    return 'cancelled';
+  }
+  if (decision.action === 'add') {
+    const transformed = host.transformDetailToProductAndBooking({
+      item: catalogItem,
+      cacheItem: decision.cacheItem,
+      options: ctx
+    });
+    await host.addProductToOrder(transformed.product, transformed.booking);
+    return 'added';
+  }
+  if (decision.action === 'requiresDetail') {
+    return runRequiresDetailFlow(host, catalogItem, ctx, bridge);
+  }
+  if (decision.action === 'requiresBookingEdit') {
+    if (!bridge?.openBookingEdit) {
+      return 'pending';
+    }
+    const edited = await bridge.openBookingEdit(decision.payload);
+    if (!edited) {
+      return 'cancelled';
+    }
+    if (!bridge.confirmBookingEdit) {
+      return 'pending';
+    }
+    await bridge.confirmBookingEdit({
+      cacheItem: edited
+    });
+    return 'added';
+  }
+  return 'pending';
+}
+
+/**
+ * 应用全局扫码格式化结果：设客户 / 加车 / 开单 / 弹窗链。
+ *
+ * @example
+ * ```ts
+ * const result = await applyGlobalScan(bookingTicket, formatted, bridge);
+ * ```
+ */
+async function applyGlobalScan(host, formatted, bridge) {
+  const {
+    searchType,
+    data,
+    scanCode
+  } = formatted;
+  if (searchType === 'wallet') {
+    if (!data) {
+      bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
+    host.setOrderCustomer(data);
+    bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
+    return {
+      status: 'success',
+      kind: 'customer'
+    };
+  }
+  if (searchType === 'walletPass') {
+    if (!data) {
+      bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
+    const snapshot = host.getOrderCustomerSnapshot();
+    const scannedCustomerIsWalkIn = (0, _cartView.isWalkInCustomer)(data);
+    if ((0, _cartView.isWalkInCustomer)(snapshot) || scannedCustomerIsWalkIn) {
+      // 当前购物车或 walletPass 绑定客户为 walk-in 时不绑客户，避免覆盖已有下单客户。
+      if (!bridge?.applyPromotionCode) {
+        return {
+          status: 'failed',
+          reason: 'no_bridge'
+        };
+      }
+      const result = await bridge.applyPromotionCode(scanCode);
+      if (result?.isAvailable) {
+        return {
+          status: 'success',
+          kind: 'promotion'
+        };
+      }
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
+    host.setOrderCustomer(data);
+    bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
+    return {
+      status: 'success',
+      kind: 'customer'
+    };
+  }
+  if (searchType === 'product' || searchType === 'local_product') {
+    const list = data?.list;
+    if (!Array.isArray(list) || list.length === 0) {
+      bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
+    let addedCount = 0;
+    for (const item of list) {
+      const outcome = await processScannedProductItem(host, item, scanCode, bridge);
+      if (outcome === 'added') {
+        addedCount += 1;
+      }
+      if (outcome === 'cancelled') {
+        return {
+          status: 'cancelled'
+        };
+      }
+      if (outcome === 'pending') {
+        return {
+          status: 'pending',
+          kind: 'requiresDetail'
+        };
+      }
+    }
+    if (addedCount > 0) {
+      bridge?.onNotify?.('success');
+      return {
+        status: 'success',
+        kind: 'products',
+        meta: {
+          count: addedCount
+        }
+      };
+    }
+    return {
+      status: 'failed',
+      reason: 'no_bridge'
+    };
+  }
+  if (searchType === 'order') {
+    const orderId = data?.order_id ?? data?.id;
+    if (!orderId) {
+      bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
+    if (!bridge?.openOrder) {
+      return {
+        status: 'pending',
+        kind: 'openOrder'
+      };
+    }
+    bridge.openOrder({
+      order_id: Number(orderId),
+      business_code: data?.business_code ?? host.getBusinessCode()
+    });
+    return {
+      status: 'pending',
+      kind: 'openOrder'
+    };
+  }
+  return {
+    status: 'failed',
+    reason: 'invalid_data'
+  };
+}

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

@@ -20,3 +20,7 @@ export declare const searchProduct: (request: RequestPlugin, code: string) => Pr
     searchType: string;
     response: any;
 }>;
+export declare const searchOrder: (request: RequestPlugin, code: string) => Promise<{
+    searchType: string;
+    response: any;
+}>;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.searchWalletPass = exports.searchWallet = exports.searchProduct = void 0;
+exports.searchWalletPass = exports.searchWallet = exports.searchProduct = exports.searchOrder = void 0;
 /**
  * 搜索通用识别码
  */
@@ -81,7 +81,7 @@ const searchProduct = async (request, code) => {
     skip: 1,
     num: 20,
     status: 'published',
-    with: ['variantGroup'],
+    with: ['variantGroup.variantItem', 'optionGroup.optionItem'],
     with_count: ['bundleGroup', 'optionGroup'],
     exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item']
   };
@@ -98,4 +98,25 @@ const searchProduct = async (request, code) => {
     throw error;
   }
 };
-exports.searchProduct = searchProduct;
+exports.searchProduct = searchProduct;
+const searchOrder = async (request, code) => {
+  try {
+    // 注意 下面这段由于 pisellos: server/index 的特性，可能转发到本地去数据库查询
+    const res = await request?.get(`/order/sales/${code}`, {
+      lookup_mode: 'multi'
+    }, {
+      customToast: () => {},
+      osServer: true
+    });
+    if (res?.code == 200 && !!res?.data) {
+      return {
+        searchType: 'order',
+        response: res
+      };
+    }
+    throw new Error('没有找到对应的识别码');
+  } catch (error) {
+    throw error;
+  }
+};
+exports.searchOrder = searchOrder;

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

@@ -0,0 +1,32 @@
+/**
+ * 全局扫码搜索结果格式化（对齐 ticketBooking `formatScanGlobal`）。
+ */
+export type GlobalScanSearchType = 'customer' | 'wallet' | 'walletPass' | 'product' | 'local_product' | 'order';
+export interface GlobalScanFormattedResult {
+    searchType: GlobalScanSearchType;
+    data: any;
+    scanCode: string;
+}
+interface RawScanSearchResult {
+    searchType?: GlobalScanSearchType;
+    response?: {
+        status?: boolean;
+        code?: number;
+        message?: string;
+        data?: any;
+    };
+}
+/**
+ * 将 handleGlobalScan 返回的原始结构格式化为 UI/OS 统一结构。
+ *
+ * @example
+ * ```ts
+ * const formatted = formatGlobalScanResult(
+ *   { searchType: 'wallet', response: { code: 200, data: { customer: {...} } } },
+ *   'WL123',
+ * );
+ * // => { searchType: 'wallet', data: customerObj, scanCode: 'WL123' }
+ * ```
+ */
+export declare function formatGlobalScanResult(raw: RawScanSearchResult | null | undefined, scanCode: string): GlobalScanFormattedResult | null;
+export {};

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

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatGlobalScanResult = formatGlobalScanResult;
+/**
+ * 全局扫码搜索结果格式化（对齐 ticketBooking `formatScanGlobal`）。
+ */
+
+/**
+ * 将 handleGlobalScan 返回的原始结构格式化为 UI/OS 统一结构。
+ *
+ * @example
+ * ```ts
+ * const formatted = formatGlobalScanResult(
+ *   { searchType: 'wallet', response: { code: 200, data: { customer: {...} } } },
+ *   'WL123',
+ * );
+ * // => { searchType: 'wallet', data: customerObj, scanCode: 'WL123' }
+ * ```
+ */
+function formatGlobalScanResult(raw, scanCode) {
+  if (!raw?.searchType) return null;
+  const {
+    searchType
+  } = raw;
+  const {
+    data: resultData,
+    code
+  } = raw.response || {};
+  if (code !== 200 && searchType !== 'local_product') {
+    return null;
+  }
+  if (searchType === 'wallet') {
+    return {
+      searchType,
+      data: resultData?.customer,
+      scanCode
+    };
+  }
+  if (searchType === 'walletPass') {
+    return {
+      searchType,
+      data: resultData?.[0]?.customer,
+      scanCode
+    };
+  }
+  if (searchType === 'product' || searchType === 'local_product') {
+    return {
+      searchType,
+      data: resultData,
+      scanCode
+    };
+  }
+  if (searchType === 'order') {
+    return {
+      searchType,
+      data: resultData,
+      scanCode
+    };
+  }
+  return null;
+}

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

@@ -2,9 +2,11 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;

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

@@ -96,16 +96,18 @@ const handleScanFn = (getRequestList, localSearch) => {
 /**
  * 处理全局扫码
  * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
  * @returns 处理结果
  */
-const handleGlobalScan = (request, localSearch) => {
+const handleGlobalScan = (request, localSearch, channel) => {
   const getRequestList = value => {
     let requestList = [];
     // 如果value是已WL开头的，则认为是钱包识别码
     if (value.startsWith('WL')) {
       requestList = [(0, _cloudSearch.searchWallet)(request, value)];
     } else {
-      requestList = [(0, _cloudSearch.searchWalletPass)(request, value), (0, _cloudSearch.searchWallet)(request, value), (0, _cloudSearch.searchProduct)(request, value)];
+      requestList = [...(channel === 'kiosk' ? [] : [(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/BookingTicket/utils/scan/index.d.ts

@@ -14,12 +14,17 @@ declare enum ScanResultType {
     NativeScanner = "nativeScanner"
 }
 export default class Scan {
+    private static scanInstances;
+    private static peripheralsListenerMounted;
     private solution;
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
     /**
      * 初始化外设扫码结果监听
+     *
+     * @example
+     * scan.initPeripheralsListener();
      */
     initPeripheralsListener(): void;
     /**

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

@@ -14,12 +14,15 @@ var ScanResultType = /*#__PURE__*/function (ScanResultType) {
   return ScanResultType;
 }(ScanResultType || {});
 class Scan {
+  static scanInstances = new Set();
+  static peripheralsListenerMounted = false;
   solution;
   watchKey;
   listenerConfig = new Map();
   constructor(solution, watchKey) {
     this.solution = solution;
     this.watchKey = watchKey;
+    Scan.scanInstances.add(this);
 
     // 初始化扫码监听
     // this.initPeripheralsListener();
@@ -27,12 +30,19 @@ class Scan {
 
   /**
    * 初始化外设扫码结果监听
+   *
+   * @example
+   * scan.initPeripheralsListener();
    */
   initPeripheralsListener() {
+    if (Scan.peripheralsListenerMounted) return;
+    Scan.peripheralsListenerMounted = true;
     this.solution?.window?.interaction?.utils?.mountFunction?.('global', 'peripheralsResult', strVal => {
       try {
         const result = JSON.parse(strVal);
-        this.handleScan(result);
+        Scan.scanInstances.forEach(instance => {
+          instance.handleScan(result);
+        });
       } catch (err) {
         console.error(err);
       }
@@ -49,8 +59,9 @@ class Scan {
     if (lastEnableEventKey) {
       const listenerConfig = this.listenerConfig.get(lastEnableEventKey);
       if (listenerConfig) {
+        const taskUuid = this.generateUuid();
         listenerConfig.task.addTask({
-          uuid: this.generateUuid(),
+          uuid: taskUuid,
           type: lastEnableEventKey,
           actionParams: {
             scanResult: result
@@ -108,6 +119,7 @@ class Scan {
    * 移除所有监听
    */
   removeAllListeners() {
+    Scan.scanInstances.delete(this);
     _watch.default.clearEvent(this.watchKey);
     this.listenerConfig?.forEach?.(item => {
       item?.task?.clear();

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

@@ -0,0 +1,21 @@
+/**
+ * 扫码商品条码预选规格纯函数（对齐 ticketBooking addServiceVariant/utils）。
+ */
+/** 套餐商品 */
+export declare function isScanProductBundle(item: any): boolean;
+/** 单规格 / 选项组商品 */
+export declare function isScanProductOption(item: any): boolean;
+/**
+ * 根据条码匹配 variant，生成 cartDetailValue（对齐 ticketBooking `genValues`）。
+ *
+ * @example
+ * ```ts
+ * const values = genScanProductValues(catalogItem, '6901234567890');
+ * const itemWithSelection = { ...catalogItem, cartDetailValue: values };
+ * ```
+ */
+export declare function genScanProductValues(item: any, code: string): Record<string, any>;
+/**
+ * 统计条码命中的 variant 数量（多命中时需弹窗选择）。
+ */
+export declare function countScanVariantMatches(item: any, code: string): number;

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

@@ -0,0 +1,115 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.countScanVariantMatches = countScanVariantMatches;
+exports.genScanProductValues = genScanProductValues;
+exports.isScanProductBundle = isScanProductBundle;
+exports.isScanProductOption = isScanProductOption;
+/**
+ * 扫码商品条码预选规格纯函数（对齐 ticketBooking addServiceVariant/utils）。
+ */
+
+/** 套餐商品 */
+function isScanProductBundle(item) {
+  return (item?.bundle_group_count || 0) > 0;
+}
+
+/** 单规格 / 选项组商品 */
+function isScanProductOption(item) {
+  return (item?.option_group_count || 0) > 0 || (item?.option_group?.length || 0) > 0;
+}
+function formatVariantGroupTitle(title, variantGroup = []) {
+  try {
+    return variantGroup.map(group => {
+      const value = title?.[group?.position_id];
+      return value ? `${group?.name || '-'}: ${value}` : '';
+    }).filter(Boolean).join(', ');
+  } catch {
+    return '';
+  }
+}
+function formatDataKey(data) {
+  const next = {
+    ...data
+  };
+  let key = `${next.product_id}`;
+  let rowKey = key;
+  if (next.product_variant_id) {
+    const str = `_${next.product_variant_id}`;
+    key += str;
+    rowKey += str;
+  }
+  if (next?.option?.length) {
+    for (const item of next.option) {
+      const str = `_${item.option_group_id}_${item.product_option_item_id}`;
+      key += str;
+      rowKey += `${str}_${item.quantity || item.num}`;
+    }
+  }
+  if (next?.bundle?.length) {
+    for (const item of next.bundle) {
+      let str = `_${item.group_id}_${item.bundle_product_id}`;
+      key += str;
+      rowKey += `${str}_${item.quantity || item.num}`;
+      if (item?.option) {
+        for (const opt of item.option) {
+          const optStr = `_${opt.option_group_id}_${opt.product_option_item_id}`;
+          key += optStr;
+          rowKey += `${optStr}_${opt.quantity || opt.num}`;
+        }
+      }
+    }
+  }
+  if (next?.session) {
+    const str = `_${next.session?.key}`;
+    key += str;
+    rowKey += str;
+  }
+  if (next?.schedule) {
+    const str = `_${next.schedule?.key}`;
+    key += str;
+    rowKey += str;
+  }
+  next.key = key;
+  next.rowKey = rowKey;
+  return next;
+}
+
+/**
+ * 根据条码匹配 variant，生成 cartDetailValue（对齐 ticketBooking `genValues`）。
+ *
+ * @example
+ * ```ts
+ * const values = genScanProductValues(catalogItem, '6901234567890');
+ * const itemWithSelection = { ...catalogItem, cartDetailValue: values };
+ * ```
+ */
+function genScanProductValues(item, code) {
+  const params = {
+    bundle: [],
+    option: [],
+    product_id: item.id,
+    product_variant_id: 0,
+    quantity: 1,
+    rowKey: '',
+    session: null
+  };
+  if (item?.variant_group?.length || item?.option_group?.length) {
+    const variantItem = (item.variant || []).find(v => v?.code === code || v?.barcode === code);
+    if (variantItem) {
+      params.price = Number(variantItem?.price || 0);
+      params.product_variant_id = variantItem.id;
+      params.product_option_string = formatVariantGroupTitle(variantItem?.title, item?.variant_group || []);
+    }
+  }
+  return formatDataKey(params);
+}
+
+/**
+ * 统计条码命中的 variant 数量（多命中时需弹窗选择）。
+ */
+function countScanVariantMatches(item, code) {
+  return (item?.variant || []).filter(v => v?.code === code || v?.barcode === code).length;
+}

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

@@ -0,0 +1,23 @@
+import type { ProductData } from '../../../modules/Product/types';
+export interface SessionCatalogStaleInfo {
+    productId: number | string | null;
+    productTitle: string | null;
+    sessionDay: string | null;
+    timeBarDay: string | null;
+    bookingDate: unknown;
+}
+/**
+ * 判断 session 商品 catalog 中的 session 日历日是否与当前 TimeBar / bookingDate 不一致。
+ *
+ * @example
+ * isSessionCatalogDateStale(product, '2026-06-05 19:01:18');
+ * // session 为 2026-06-04 → true；一致或无 session 快照 → false
+ */
+export declare function isSessionCatalogDateStale(product: ProductData & Record<string, any>, bookingDate: unknown): boolean;
+/**
+ * 组装 session catalog 日期不一致时的日志 metadata。
+ *
+ * @example
+ * buildSessionCatalogStaleInfo(product, '2026-06-05 19:01:18');
+ */
+export declare function buildSessionCatalogStaleInfo(product: ProductData & Record<string, any>, bookingDate: unknown): SessionCatalogStaleInfo;