@pisell/pisellos 0.10.42 → 0.10.44

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

@@ -106,16 +106,12 @@ async function applyGlobalScan(host, formatted, bridge) {
     data,
     scanCode,
     customerId: formattedCustomerId,
-    isCrossShopWallet
+    isCrossShopWallet,
+    isWalletPassUnavailableAtStore
   } = formatted;
   if (searchType === 'wallet') {
     const currentCustomer = host.getOrderCustomerSnapshot();
-    if (getRealCustomerId(currentCustomer) !== undefined) {
-      return {
-        status: 'success',
-        kind: 'customer'
-      };
-    }
+    const currentCustomerId = getRealCustomerId(currentCustomer);
     let customer = data;
     if (isCrossShopWallet) {
       const sourceCustomerId = getRealCustomerId({
@@ -152,6 +148,36 @@ async function applyGlobalScan(host, formatted, bridge) {
       ...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 {
@@ -160,13 +186,20 @@ 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 currentCustomerIsWalkIn = getRealCustomerId(snapshot) === undefined;
     let activeCustomer = snapshot;
     const bindWalletPassCustomer = async asset => {
-      if (!currentCustomerIsWalkIn) {
+      if (getRealCustomerId(activeCustomer) !== undefined) {
         return {
-          resolveFailed: false
+          resolveFailed: false,
+          customerBound: false
         };
       }
       const assetCustomerId = getWalletAssetCustomerId(asset) ?? getRealCustomerId({
@@ -177,7 +210,8 @@ async function applyGlobalScan(host, formatted, bridge) {
         if (!host.resolveCustomerById) {
           bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
           return {
-            resolveFailed: true
+            resolveFailed: true,
+            customerBound: false
           };
         }
         try {
@@ -186,7 +220,8 @@ async function applyGlobalScan(host, formatted, bridge) {
           console.warn('[GlobalScan] Wallet asset customer lookup failed', error);
           bridge?.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
           return {
-            resolveFailed: true
+            resolveFailed: true,
+            customerBound: false
           };
         }
       }
@@ -196,7 +231,8 @@ async function applyGlobalScan(host, formatted, bridge) {
           bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
         }
         return {
-          resolveFailed: assetCustomerId !== undefined
+          resolveFailed: assetCustomerId !== undefined,
+          customerBound: false
         };
       }
       const orderCustomer = customer.id === undefined || customer.id === null ? {
@@ -210,7 +246,8 @@ async function applyGlobalScan(host, formatted, bridge) {
         retainSearchResultCodes: [scanCode]
       });
       return {
-        resolveFailed: false
+        resolveFailed: false,
+        customerBound: true
       };
     };
     const trySelectWalletAsset = async () => {
@@ -242,24 +279,34 @@ async function applyGlobalScan(host, formatted, bridge) {
         reason: 'invalid_data'
       };
     };
+
+    // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
+    // 支付资产查询使用本店客户上下文。
+    const bindResult = await bindWalletPassCustomer();
     const walletSelection = await trySelectWalletAsset();
     if (walletSelection) return walletSelection;
-
-    // 非支付类 Wallet Pass 仍可能由 batch-search 返回所属客户。
-    await bindWalletPassCustomer();
     if (!bridge?.applyPromotionCode) {
       return {
         status: 'failed',
         reason: 'no_bridge'
       };
     }
-    const promotionResult = await bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer));
+    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'
+      };
+    }
     return {
       status: 'failed',
       reason: 'invalid_data'

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

@@ -15,7 +15,7 @@ const searchWalletPass = async (request, code) => {
     relation_product: 1,
     // 组装关联商品: 0不处理 1处理
     with_franchisor_data: 1,
-    with: ['customer'],
+    with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
     tags: ['point_card',
     // 积分卡
     'gift_card',

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

@@ -10,6 +10,8 @@ export interface GlobalScanFormattedResult {
     customerId?: string | number;
     /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
     isCrossShopWallet?: boolean;
+    /** 总店 Wallet Pass 未共享给当前子店。 */
+    isWalletPassUnavailableAtStore?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;

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

@@ -43,11 +43,15 @@ function formatGlobalScanResult(raw, scanCode) {
   }
   if (searchType === 'walletPass') {
     const firstResult = resultData?.[0];
+    const isWalletPassUnavailableAtStore = firstResult?.is_franchisor_pass === 1 && firstResult?.franchisee_wallet_pass?.use !== 'enabled';
     return {
       searchType,
       data: firstResult?.customer,
       scanCode,
-      customerId: firstResult?.customer_id ?? firstResult?.holder?.customer_id ?? firstResult?.customer?.id ?? firstResult?.customer?.customer_id
+      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/RegisterAndLogin/config.d.ts

@@ -10,7 +10,11 @@ export interface ApiConfig {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';
     transformParams?: (params: any) => any;
     transformResponse?: (response: any) => any;
-    options?: Record<string, any>;
+    options?: Record<string, any> | ((params: any) => Record<string, any>);
+}
+export interface ApiCallerOptions {
+    baseUrl?: string;
+    shopDomain?: string;
 }
 /**
  * 渠道配置接口
@@ -65,12 +69,14 @@ export declare function getChannelConfig(channel: string): ChannelConfig;
 export declare class ApiCaller {
     private request;
     private config;
+    private options;
     constructor(request: {
         get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
         delete: <T = any>(url: string, options?: any) => Promise<T>;
-    }, config: ChannelConfig);
+    }, config: ChannelConfig, options?: ApiCallerOptions);
+    private resolveUrl;
     /**
      * 执行 API 调用
      */
@@ -84,4 +90,4 @@ export declare function createApiCaller(request: {
     post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
     delete: <T = any>(url: string, options?: any) => Promise<T>;
-}, channel: string): ApiCaller;
+}, channel: string, options?: ApiCallerOptions): ApiCaller;

package/lib/solution/RegisterAndLogin/config.js

@@ -15,6 +15,8 @@ exports.getChannelConfig = getChannelConfig;
  * API 配置接口
  */
 
+const h5CustomerAuthApiNames = new Set(['sendEmailVerificationCode', 'sendEmailLoginCode', 'sendSmsRegisterCode', 'sendEmailRegisterLink', 'verifyEmailRegistrationLink', 'emailPasswordLogin', 'emailCodeRegister', 'phoneCodeRegister', 'resendEmailRegisterLink', 'checkEmailLinkCode', 'sendSmsLoginCode', 'phoneCodeLogin', 'guestLogin', 'checkEmailExists', 'checkEmailCode', 'checkMobileCode', 'phonePasswordLogin', 'sendPasswordResetEmail', 'sendPasswordResetSms', 'sendResetPasswordLink', 'checkResetPasswordCode', 'resetPasswordByCode', 'resetPasswordByEmail', 'resetPasswordByPhone', 'verifyCode', 'register', 'login', 'oauthLogin', 'facebookLogin', 'appleLogin']);
+
 /**
  * 渠道配置接口
  */
@@ -278,6 +280,31 @@ const onlineStoreConfig = {
     })
   }
 };
+function withH5AuthPrefix(config) {
+  const nextConfig = {};
+  Object.entries(config).forEach(([key, apiConfig]) => {
+    if (!apiConfig.url.startsWith('/auth/')) {
+      nextConfig[key] = apiConfig;
+      return;
+    }
+    nextConfig[key] = {
+      ...apiConfig,
+      url: apiConfig.url.startsWith('/h5/') ? apiConfig.url : `/h5${apiConfig.url}`,
+      options: params => {
+        const {
+          withCredentials,
+          ...baseOptions
+        } = (typeof apiConfig.options === 'function' ? apiConfig.options(params) : apiConfig.options) || {};
+        return {
+          ...baseOptions,
+          prefix: false
+        };
+      }
+    };
+  });
+  return nextConfig;
+}
+const h5OnlineStoreConfig = withH5AuthPrefix(onlineStoreConfig);
 
 /**
  * 默认配置（通用配置）
@@ -1066,6 +1093,7 @@ const shopWebposConfig = {
  */
 const channelConfigMap = exports.channelConfigMap = {
   'online-store': onlineStoreConfig,
+  'online-store-h5': h5OnlineStoreConfig,
   'default': defaultConfig,
   'webpos': webposConfig,
   'shop.webpos': shopWebposConfig
@@ -1083,9 +1111,16 @@ function getChannelConfig(channel) {
  * 负责根据配置执行 API 调用
  */
 class ApiCaller {
-  constructor(request, config) {
+  constructor(request, config, options = {}) {
     this.request = request;
     this.config = config;
+    this.options = options;
+  }
+  resolveUrl(url) {
+    if (!this.options.baseUrl || !url.startsWith('/h5/auth/')) {
+      return url;
+    }
+    return `${this.options.baseUrl.replace(/\/$/, '')}${url}`;
   }
 
   /**
@@ -1111,6 +1146,12 @@ class ApiCaller {
       ...options,
       ...additionalOptions
     };
+    if (apiConfig.url.startsWith('/h5/auth/') && h5CustomerAuthApiNames.has(apiName)) {
+      requestOptions.h5CustomerAuth = true;
+      if (this.options.shopDomain) {
+        requestOptions.h5AuthShopDomain = this.options.shopDomain;
+      }
+    }
 
     // 处理动态 headers
     if (requestOptions.headers && typeof requestOptions.headers === 'function') {
@@ -1123,19 +1164,19 @@ class ApiCaller {
     switch (apiConfig.method) {
       case 'GET':
         if (transformedParams && Object.keys(transformedParams).length > 0) {
-          response = await this.request.get(apiConfig.url, transformedParams, requestOptions);
+          response = await this.request.get(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
         } else {
-          response = await this.request.get(apiConfig.url, undefined, requestOptions);
+          response = await this.request.get(this.resolveUrl(apiConfig.url), undefined, requestOptions);
         }
         break;
       case 'POST':
-        response = await this.request.post(apiConfig.url, transformedParams, requestOptions);
+        response = await this.request.post(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
         break;
       case 'PUT':
-        response = await this.request.put(apiConfig.url, transformedParams, requestOptions);
+        response = await this.request.put(this.resolveUrl(apiConfig.url), transformedParams, requestOptions);
         break;
       case 'DELETE':
-        response = await this.request.delete(apiConfig.url, requestOptions);
+        response = await this.request.delete(this.resolveUrl(apiConfig.url), requestOptions);
         break;
       default:
         throw new Error(`不支持的 HTTP 方法: ${apiConfig.method}`);
@@ -1150,7 +1191,7 @@ class ApiCaller {
  * 创建 API 调用器
  */
 exports.ApiCaller = ApiCaller;
-function createApiCaller(request, channel) {
+function createApiCaller(request, channel, options) {
   const config = getChannelConfig(channel);
-  return new ApiCaller(request, config);
+  return new ApiCaller(request, config, options);
 }

package/lib/solution/RegisterAndLogin/index.js

@@ -227,7 +227,10 @@ class RegisterAndLoginImpl extends _BaseModule.BaseModule {
     }
 
     // 创建 API 调用器
-    this.apiCaller = (0, _config.createApiCaller)(this.request, this.channel);
+    this.apiCaller = (0, _config.createApiCaller)(this.request, this.channel, {
+      baseUrl: this.otherParams.h5AuthBaseUrl,
+      shopDomain: this.otherParams.h5AuthShopDomain
+    });
 
     // 尝试从本地存储恢复登录状态
     await this.restoreLoginState();

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

@@ -13,6 +13,7 @@ interface ScanOrderItemRuleRuntimeConfig {
     pax?: Partial<PaxInfo>;
     historicalItems?: CartItemSummary[];
     serviceType?: string;
+    channel?: string;
     submissionIndex?: number;
     custom?: Record<string, any>;
 }

package/lib/solution/ScanOrder/index.js

@@ -1200,7 +1200,11 @@ class ScanOrderImpl extends _BaseSales.BaseSalesImpl {
     return sourceMap;
   }
   getItemRuleRuntimeConfig() {
-    return this.itemRuleRuntimeConfig || {};
+    const runtimeConfig = this.itemRuleRuntimeConfig || {};
+    return {
+      ...runtimeConfig,
+      channel: runtimeConfig.channel ?? runtimeConfig.custom?.channel ?? this.otherParams?.channel
+    };
   }
   async ensureItemRuleConfigsLoaded() {
     if (this.itemRuleConfigs.length > 0) return this.itemRuleConfigs;

package/lib/solution/ScanOrder/utils.d.ts

@@ -78,6 +78,7 @@ export declare function buildItemRuleBusinessData(params: {
         pax?: Partial<PaxInfo>;
         historicalItems?: CartItemSummary[];
         serviceType?: string;
+        channel?: string;
         submissionIndex?: number;
         custom?: Record<string, any>;
     };

package/lib/solution/ScanOrder/utils.js

@@ -333,6 +333,7 @@ function buildItemRuleBusinessData(params) {
     cartItems,
     historicalItems,
     serviceType: runtimeConfig.serviceType || 'dine-in',
+    channel: runtimeConfig.channel ?? runtimeConfig.custom?.channel,
     submissionIndex: typeof runtimeConfig.submissionIndex === 'number' ? toNonNegativeInt(runtimeConfig.submissionIndex) : tempOrder.order_id ? 1 : 0,
     custom: runtimeConfig.custom || {},
     strategyConfigs: itemRuleConfigs

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

@@ -2,10 +2,11 @@ import type { Module, ModuleOptions, PisellCore } from '../../types';
 import type { ProductData } from '../../modules';
 import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
-import type { ProductListLoadProductsParams } from '../../modules/ProductList';
+import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
-import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesResolveProductAllergyRequirementParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import { BookingTicket } from '../BookingTicket';
+import type { AllergyRequirement } from '../../model/strategy/adapter/itemRule';
 export * from './types';
 export { AvailabilityError } from '../../modules/ResourcePlanner';
 /**
@@ -73,6 +74,9 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private availabilityRemoteResourceQuerySequence;
     private availabilityRemoteResourceEpoch;
     private availabilityCommitLocks;
+    private allergyItemRuleEvaluator;
+    private allergyItemRuleConfigs;
+    private allergyItemRuleConfigsPromise;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     protected getSubmitOrderSalesChannel(): string;
     private createAvailabilityFacadeError;
@@ -144,6 +148,14 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    private resetAllergyItemRuleState;
+    private fetchAllergyItemRuleConfigs;
+    private ensureAllergyItemRuleConfigsLoaded;
+    /**
+     * 评估当前渠道与商品是否命中 ALLERGY_CHECK。
+     * 只返回优先级最高 Action 中当前商品 Target 的 dataSource，不跨商品或 Action 合并。
+     */
+    resolveProductAllergyRequirement(params: UnifiedBookingSalesResolveProductAllergyRequirementParams): Promise<AllergyRequirement | null>;
     clearOpenDataCache(): void;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
@@ -160,6 +172,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<ProductData[]>;
+    queryProducts(params?: ProductListStoreQueryParams): Promise<ProductData[]>;
     /** Date-first entry point. It delegates protocol details and cache ownership to ScheduleModule. */
     loadScheduleAvailableDate(params: LoadScheduleAvailableDateParams): Promise<import("../../modules/Date/types").ITime[]>;
     /**

package/lib/solution/UnifiedBookingSales/index.js

@@ -52,6 +52,7 @@ var _remoteOccupancyCache = require("./remoteOccupancyCache");
 var _BookingTicket = require("../BookingTicket");
 var _localClock = require("../../modules/ResourcePlanner/localClock");
 var _platform = require("../../utils/platform");
+var _itemRule = require("../../model/strategy/adapter/itemRule");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'basic', 'checkout', 'availability', 'documents'];
 const OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
@@ -84,6 +85,22 @@ function getCandidateStartTime(candidate) {
     return undefined;
   }
 }
+function normalizePositiveIntegerList(value) {
+  if (!Array.isArray(value)) return [];
+  return Array.from(new Set(value.map(item => normalizePositiveInteger(item)).filter(item => item !== undefined)));
+}
+function toConfiguredBoolean(value) {
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'number') return value !== 0;
+  if (typeof value === 'string') {
+    return ['1', 'true', 'yes', 'y', 'on'].includes(value.trim().toLowerCase());
+  }
+  return false;
+}
+function normalizeItemRuleStrategyConfigs(value) {
+  if (!Array.isArray(value)) return [];
+  return value.filter(config => Boolean(config && typeof config === 'object' && config.metadata?.type === 'item_rule'));
+}
 function isRecord(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
 }
@@ -1197,11 +1214,15 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   availabilityRemoteResourceQuerySequence = 0;
   availabilityRemoteResourceEpoch = 0;
   availabilityCommitLocks = new Set();
+  allergyItemRuleEvaluator = new _itemRule.ItemRuleEvaluator();
+  allergyItemRuleConfigs = [];
+  allergyItemRuleConfigsPromise = null;
   async initialize(core, options = {}) {
     this.availabilityScheduleCatalog = null;
     this.openDataTarget = null;
     this.availabilityRuntimeOffsetMinutes = (0, _localClock.captureRuntimeOffsetMinutes)();
     this.clearAvailabilityRemoteResourceState();
+    this.resetAllergyItemRuleState();
     await super.initialize(core, options);
     const openDataBusinessCode = String(this.otherParams?.businessCode ?? this.otherParams?.business_code ?? '').trim();
     const openDataChannel = String(this.otherParams?.channel ?? '').trim();
@@ -1346,6 +1367,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     cover = false
   } = {}) {
     const previousScope = this.getAvailabilityScopeDescriptor(this.otherParams || {});
+    const previousItemRuleConfig = this.otherParams?.itemRule;
     const explicitlySetsOpenData = Object.prototype.hasOwnProperty.call(params, 'openData');
     await super.setOtherParams(params, {
       cover
@@ -1358,11 +1380,15 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     if (shouldResetAvailabilityState) {
       await this.resetAvailabilityProjectionState('set_other_params_reset');
     }
+    if (shouldResetAvailabilityState || explicitlySetsOpenData || previousItemRuleConfig !== this.otherParams?.itemRule) {
+      this.resetAllergyItemRuleState();
+    }
   }
   async destroy() {
     this.availabilityScheduleCatalog = null;
     this.availabilityRuntimeOffsetMinutes = null;
     await this.resetAvailabilityProjectionState('destroy');
+    this.resetAllergyItemRuleState();
     await super.destroy();
   }
   createAvailabilityContextId() {
@@ -1721,6 +1747,98 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       channel
     });
   }
+  resetAllergyItemRuleState() {
+    this.allergyItemRuleConfigs = [];
+    this.allergyItemRuleConfigsPromise = null;
+    this.allergyItemRuleEvaluator.setStrategyConfigs([]);
+  }
+  async fetchAllergyItemRuleConfigs(strategyModelIds) {
+    if (!strategyModelIds.length) return [];
+    try {
+      const response = await this.request.get('/promotion', {
+        skip: 1,
+        num: 99,
+        status: 'active',
+        ids: strategyModelIds
+      });
+      if (response?.code !== 200 || !Array.isArray(response?.data?.list)) {
+        throw new Error('[UnifiedBookingSales] 商品过敏策略加载失败');
+      }
+      const list = response.data.list;
+      return normalizeItemRuleStrategyConfigs(list.map(item => item?.metadata));
+    } catch (error) {
+      // this.logMethodError('fetchAllergyItemRuleConfigs', error, {
+      //   strategyModelIds,
+      // });
+      throw error;
+    }
+  }
+  async ensureAllergyItemRuleConfigsLoaded() {
+    if (this.allergyItemRuleConfigs.length > 0) {
+      return this.allergyItemRuleConfigs;
+    }
+    if (this.allergyItemRuleConfigsPromise) {
+      return this.allergyItemRuleConfigsPromise;
+    }
+    this.allergyItemRuleConfigsPromise = (async () => {
+      const staticConfigs = normalizeItemRuleStrategyConfigs(this.otherParams?.itemRule?.strategyConfigs);
+      if (staticConfigs.length > 0) {
+        this.allergyItemRuleConfigs = staticConfigs;
+        this.allergyItemRuleEvaluator.setStrategyConfigs(staticConfigs);
+        return staticConfigs;
+      }
+      const openData = await this.getOpenData();
+      const enabled = toConfiguredBoolean(openData?.['sale.enable_item_rules']);
+      const strategyModelIds = normalizePositiveIntegerList(openData?.['sale.enabled_item_rules']);
+      if (!enabled || !strategyModelIds.length) {
+        this.allergyItemRuleEvaluator.setStrategyConfigs([]);
+        return [];
+      }
+      const loaded = await this.fetchAllergyItemRuleConfigs(strategyModelIds);
+      this.allergyItemRuleConfigs = loaded;
+      this.allergyItemRuleEvaluator.setStrategyConfigs(loaded);
+      return loaded;
+    })();
+    return this.allergyItemRuleConfigsPromise;
+  }
+
+  /**
+   * 评估当前渠道与商品是否命中 ALLERGY_CHECK。
+   * 只返回优先级最高 Action 中当前商品 Target 的 dataSource，不跨商品或 Action 合并。
+   */
+  async resolveProductAllergyRequirement(params) {
+    const productId = normalizePositiveInteger(params.productId);
+    if (!productId) return null;
+    const strategyConfigs = await this.ensureAllergyItemRuleConfigsLoaded();
+    if (!strategyConfigs.length) return null;
+    const productVariantId = normalizePositiveInteger(params.productVariantId);
+    const runtimeConfig = this.otherParams?.itemRule || {};
+    const runtimePax = runtimeConfig.pax || {};
+    const cartItems = (this.getOrderProducts?.() || []).map(item => ({
+      product_id: Number(item?.product_id ?? item?.id),
+      product_variant_id: Number(item?.product_variant_id ?? 0) || undefined,
+      quantity: Number(item?.num ?? item?.quantity ?? 0)
+    })).filter(item => Number.isFinite(item.product_id) && item.product_id > 0 && Number.isFinite(item.quantity) && item.quantity > 0);
+    return this.allergyItemRuleEvaluator.getAllergyRequirement({
+      pax: {
+        total: Number(runtimePax.total ?? 0) || 0,
+        adult: Number(runtimePax.adult ?? 0) || 0,
+        child: Number(runtimePax.child ?? 0) || 0
+      },
+      cartItems,
+      serviceType: String(runtimeConfig.serviceType ?? this.otherParams?.serviceType ?? ''),
+      channel: String(params.channel ?? this.otherParams?.channel ?? this.otherParams?.platform ?? ''),
+      currentProduct: {
+        product_id: productId,
+        ...(productVariantId ? {
+          product_variant_id: productVariantId
+        } : {})
+      },
+      submissionIndex: Number(runtimeConfig.submissionIndex ?? 0) || 0,
+      strategyConfigs,
+      custom: runtimeConfig.custom
+    });
+  }
   clearOpenDataCache() {
     this.openDataTarget = null;
     this.loadOpenDataInFlight = null;
@@ -1783,6 +1901,10 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     await this.core.effects.emit(`${this.name}:onProductsLoaded`, result);
     return result;
   }
+  async queryProducts(params = {}) {
+    if (!this.store.products) throw new Error('[UnifiedBookingSales] products 模块未初始化');
+    return this.store.products.queryProducts(params);
+  }
 
   /** Date-first entry point. It delegates protocol details and cache ownership to ScheduleModule. */
   async loadScheduleAvailableDate(params) {
@@ -3333,7 +3455,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       } else {
         const beforeProductLineUids = new Set((this.getTempOrder()?.products || []).map(line => getProductLineUid(line)).filter(Boolean));
         const beforeBookingUids = new Set((this.getTempOrder()?.bookings || []).map(item => getBookingUid(item)).filter(Boolean));
-        const products = await this.addProductToOrder(transformed, booking);
+        const products = await this.addProductToOrder(transformed, booking, params.salesNotes?.length ? {
+          salesNotes: params.salesNotes
+        } : undefined);
         const addedLines = products.filter(line => sameAvailabilityId(line.product_id ?? line.id, refreshedCandidate.productId) && line.metadata?.availability_candidate_key === refreshedCandidate.key && !beforeProductLineUids.has(getProductLineUid(line)));
         productLineUids = addedLines.map(line => getProductLineUid(line)).filter(Boolean);
         const addedBookings = (this.getTempOrder()?.bookings || []).filter(item => item.metadata?.availability_candidate_key === refreshedCandidate.key && !beforeBookingUids.has(getBookingUid(item)));