@pisell/pisellos 2.3.94 → 2.3.96

package/lib/server/utils/small-ticket.js

@@ -32,6 +32,7 @@ const LABELS = {
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     payProcessingFee: 'Pay processing fee',
+    surchargeIncluded: 'Surcharge(Included)',
     rounding: 'Rounding',
     gross: 'Gross',
     tare: 'Tare'
@@ -58,6 +59,7 @@ const LABELS = {
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     payProcessingFee: '支付手续费',
+    surchargeIncluded: '手续费(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -84,6 +86,7 @@ const LABELS = {
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     payProcessingFee: '支付手續費',
+    surchargeIncluded: '手續費(已含)',
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
@@ -730,10 +733,17 @@ function buildResources(order, locale) {
 function buildPaymentData(params) {
   const payments = normalizeArray(params.order.payments);
   return payments.filter(payment => isPrintablePayment(payment)).map(payment => {
+    const serviceFee = getPaymentServiceFee(payment);
     const items = [{
       item: paymentMethodName(payment, params.locale),
-      value: formatMoney(payment.amount ?? payment.origin_amount, params.currencySymbol)
+      value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), params.currencySymbol)
     }];
+    if (serviceFee.gt(0)) {
+      items.push({
+        item: label(params.locale, 'surchargeIncluded'),
+        value: formatMoney(serviceFee, params.currencySymbol)
+      });
+    }
     const fundRecord = getFundRecord(payment);
     if (fundRecord) {
       items.push(...buildFundRecordPaymentItems({
@@ -758,6 +768,17 @@ function buildPaymentData(params) {
     return items;
   });
 }
+function getPaymentServiceFee(payment) {
+  return new _decimal.default(toMoneyNumber(payment.service_fee));
+}
+function resolveReceiptPaymentAmount(payment, serviceFee) {
+  const amount = new _decimal.default(toMoneyNumber(payment.amount ?? payment.origin_amount));
+  const hasAmount = payment.amount !== undefined && payment.amount !== null && payment.amount !== '';
+  const hasOriginAmount = payment.origin_amount !== undefined && payment.origin_amount !== null && payment.origin_amount !== '';
+  if (!hasAmount || !hasOriginAmount || serviceFee.lte(0)) return amount;
+  const originAmount = new _decimal.default(toMoneyNumber(payment.origin_amount));
+  return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
+}
 function buildFundRecordPaymentItems(params) {
   const {
     payment,

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

@@ -2,7 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions } from '../../modules/Order/types';
+import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -225,12 +225,20 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderSyncState(): import("../../modules/Order/types").OrderSyncState;
     getOrderAmountSnapshot(): import("../../modules/Order/types").OrderAmountSnapshot | null;
     getTempOrderNote(): string;
+    getSalesNotes(): SalesNote[];
+    createSalesNotesMutationSnapshot(): SalesNotesMutationSnapshot;
+    restoreSalesNotesMutationSnapshot(snapshot: SalesNotesMutationSnapshot): void;
+    setSalesNote(input: SetSalesNoteInput): Promise<SalesNote>;
+    removeSalesNote(uuid: string): Promise<void>;
+    clearSalesNotes(): Promise<void>;
     updateTempOrderNote(note: string): string;
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderDepositAmount(amount: string | number): OrderSummary;
+    setPickupReferenceMode(mode: PickupReferenceMode): ShopServiceData;
+    setServiceType(serviceType: ShopServiceType): ShopServiceData;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;

package/lib/solution/BaseSales/index.js

@@ -283,7 +283,56 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
   loadedValue.forEach(appendOrReplaceByUid);
   return result;
 }
+
+// checkout / realtime snapshots may reorder protocol arrays or append persistence fields.
+// Compare only the Sales Note protocol fields so a matching remote echo can acknowledge dirty state.
+function normalizeBaseSalesNotesForComparison(value, options) {
+  if (!Array.isArray(value)) return null;
+  const unresolvedOrderTargetUuid = String(options?.unresolvedOrderTargetUuid ?? '').trim();
+  return value.map(note => {
+    if (!note || typeof note !== 'object' || Array.isArray(note)) {
+      return (0, _lodashEs.cloneDeep)(note);
+    }
+    const noteRecord = note;
+    const relations = Array.isArray(noteRecord.note_relations) ? noteRecord.note_relations.map(relation => {
+      if (!relation || typeof relation !== 'object' || Array.isArray(relation)) {
+        return (0, _lodashEs.cloneDeep)(relation);
+      }
+      const shouldResolveOrderTarget = relation.is_primary === 0 && relation.relation_type === 'related_to' && relation.target_type === 'order' && String(relation.target_uuid ?? '').trim() === '' && unresolvedOrderTargetUuid.length > 0;
+      return {
+        uuid: relation.uuid,
+        relation_type: relation.relation_type,
+        target_type: relation.target_type,
+        target_uuid: shouldResolveOrderTarget ? unresolvedOrderTargetUuid : relation.target_uuid,
+        is_primary: relation.is_primary
+      };
+    }).sort((left, right) => String(left?.uuid ?? '').localeCompare(String(right?.uuid ?? ''))) : (0, _lodashEs.cloneDeep)(noteRecord.note_relations);
+    return {
+      uuid: noteRecord.uuid,
+      note_type: noteRecord.note_type,
+      content: {
+        text: (0, _lodashEs.cloneDeep)(noteRecord.content?.text)
+      },
+      importance: noteRecord.importance,
+      note_relations: relations
+    };
+  }).sort((left, right) => String(left?.uuid ?? '').localeCompare(String(right?.uuid ?? '')));
+}
+function areBaseSalesNotesEquivalent(currentValue, loadedValue, options) {
+  const currentNotes = normalizeBaseSalesNotesForComparison(currentValue, {
+    unresolvedOrderTargetUuid: options?.currentOrderTargetUuid
+  });
+  const loadedNotes = normalizeBaseSalesNotesForComparison(loadedValue);
+  return currentNotes !== null && loadedNotes !== null && (0, _lodashEs.isEqual)(currentNotes, loadedNotes);
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
+  const loadedHasSalesNotes = Object.prototype.hasOwnProperty.call(loadedRecord || {}, 'notes');
+  const hasDirtyLocalSalesNotes = currentTempOrder?._extend?.salesNotesState?.dirty === true;
+  const incomingSalesNotesMatchLocal = loadedHasSalesNotes && areBaseSalesNotesEquivalent(currentTempOrder?.notes, loadedRecord.notes, {
+    currentOrderTargetUuid: loadedRecord?.shop_order_number || currentTempOrder?.shop_order_number
+  });
+  const shouldAwaitAuthoritativeSalesNotes = strategy === 'authoritative-incoming' && hasDirtyLocalSalesNotes && (Number(loadedRecord?.need_sync) === 1 || !incomingSalesNotesMatchLocal);
+  const preserveDirtyLocalSalesNotes = hasDirtyLocalSalesNotes && (strategy === 'preserve-local' || shouldAwaitAuthoritativeSalesNotes);
   const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(loadedRecord || {}, {
     ensureUid: false
   });
@@ -295,6 +344,12 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
   });
   const uidRemaps = [];
   const mergedRecord = (0, _lodashEs.mergeWith)(normalizedCurrentTempOrder, normalizedLoadedRecord, (currentValue, loadedValue, key) => {
+    if (key === 'notes') {
+      if (preserveDirtyLocalSalesNotes && Array.isArray(currentValue)) {
+        return (0, _lodashEs.cloneDeep)(currentValue);
+      }
+      if (Array.isArray(loadedValue)) return (0, _lodashEs.cloneDeep)(loadedValue);
+    }
     const collectionKind = getBaseSalesOrderCollectionKind(key);
     if (collectionKind && Array.isArray(loadedValue)) {
       return mergeBaseSalesOrderCollection(collectionKind, Array.isArray(currentValue) ? currentValue : [], loadedValue, strategy, uidRemaps);
@@ -318,7 +373,24 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
     return undefined;
   });
   delete mergedRecord.request_unique_idempotency_token;
-  return normalizeBaseSalesRecordCollections((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps));
+  const normalizedMergedRecord = normalizeBaseSalesRecordCollections((0, _orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps));
+  normalizedMergedRecord._extend = {
+    ...(normalizedMergedRecord._extend || {}),
+    salesNotesState: preserveDirtyLocalSalesNotes ? {
+      loaded: true,
+      dirty: true
+    } : loadedHasSalesNotes ? {
+      loaded: true,
+      dirty: normalizedLoadedRecord._extend?.salesNotesState?.dirty === true
+    } : {
+      loaded: false,
+      dirty: false
+    }
+  };
+  if (!loadedHasSalesNotes && !preserveDirtyLocalSalesNotes) {
+    delete normalizedMergedRecord.notes;
+  }
+  return normalizedMergedRecord;
 }
 function filterPendingPaymentsFromLoadedSalesDetail(sourceRecord) {
   if (!sourceRecord || typeof sourceRecord !== 'object') return sourceRecord;
@@ -1426,6 +1498,30 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) return '';
     return this.store.order.getTempOrderNote();
   }
+  getSalesNotes() {
+    if (!this.store.order) return [];
+    return this.store.order.getSalesNotes();
+  }
+  createSalesNotesMutationSnapshot() {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.createSalesNotesMutationSnapshot();
+  }
+  restoreSalesNotesMutationSnapshot(snapshot) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    this.store.order.restoreSalesNotesMutationSnapshot(snapshot);
+  }
+  async setSalesNote(input) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.setSalesNote(input);
+  }
+  async removeSalesNote(uuid) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.store.order.removeSalesNote(uuid);
+  }
+  async clearSalesNotes() {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.store.order.clearSalesNotes();
+  }
   updateTempOrderNote(note, sync = false) {
     try {
       if (!this.store.order) throw new Error('order 模块未初始化');
@@ -1447,6 +1543,14 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderDepositAmount(amount);
   }
+  setPickupReferenceMode(mode) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderPickupReferenceMode(mode);
+  }
+  setServiceType(serviceType) {
+    if (!this.store.order) throw new Error('order 模块未初始化');
+    return this.store.order.updateTempOrderServiceType(serviceType);
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -191,9 +191,10 @@ function transformBaseProductToOrderProduct(params) {
     metadata.unique_identification_number = String(uniqueIdentificationNumber);
   }
   // 从源头补充商品多语言标题
+  const productTitleI18n = sourceProduct?.title_i18n || {};
   const productTitle = {
-    ...(sourceProduct?.title_i18n || {}),
-    original: sourceProduct?.original_title || sourceProduct?.title || ''
+    ...productTitleI18n,
+    original: productTitleI18n.original || sourceProduct?.original_title || sourceProduct?.title || ''
   };
   return {
     product_id: productId,

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 | 4 | 3 | 6;
+        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/utils/orderCustomer.js

@@ -23,7 +23,8 @@ function resolveCustomerDisplayName(customer) {
 
 /** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
 function formatOrderCustomerPatch(customer) {
-  const rawId = customer.id;
+  const c = customer;
+  const rawId = c.customer_id ?? c.customerId ?? customer.id;
   const numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
   return {
     customer_id: Number.isFinite(numericId) ? numericId : null,

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 { 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';
 /**
@@ -76,6 +77,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;
@@ -147,6 +151,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>;
     /**
      * Load a resource policy without depending on the legacy appointmentBooking solution.
      */
@@ -159,6 +171,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[]>;
     /**