@pisell/pisellos 0.10.43 → 0.10.44

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

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

@@ -1,8 +1,12 @@
 import type { InvoiceLayoutConfig, InvoiceTemplateSettings, OpenDataConfig } from '../../modules/OpenData';
-import type { ProductListLoadProductsParams } from '../../modules/ProductList';
+import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
+import type { ProductData } from '../../modules/Product/types';
 import type { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import type { AvailabilityDateRange, AvailabilityErrorCode, AvailabilityId, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProjection, AvailabilityQuery, AvailabilityRequirementSelection, AvailabilityResource, AvailabilitySelectionValidationResult, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, ResourceAvailabilityGroup, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem } from '../../modules/ResourcePlanner';
 import type { BookingTicketState } from '../BookingTicket/types';
+import type { AllergyRequirement } from '../../model/strategy/adapter/itemRule';
+import type { SalesNoteDraftInput } from '../../modules/Order/types';
+export type { ProductListStoreQueryParams } from '../../modules/ProductList';
 export type { AvailabilityAbsoluteRange, AvailabilityAssignment, AvailabilityCell, AvailabilityDateRange, AvailabilityDisplayRange, AvailabilityErrorCode, AvailabilityId, AvailabilityMode, AvailabilityOccupancy, AvailabilityProduct, AvailabilityProductKind, AvailabilityProjection, AvailabilityProjectionInput, AvailabilityProjectionMeta, AvailabilityQuery, AvailabilityQueryResult, AvailabilityRequirementGroup, AvailabilityRequirementGroupResult, AvailabilityRequirementSelection, AvailabilityResource, AvailabilityResourceOption, AvailabilityResourceType, AvailabilityResourceWindow, AvailabilityScheduleMode, AvailabilityScheduleRef, AvailabilityScheduleRule, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, AvailabilitySessionRange, AvailabilityStatus, DateAvailabilityGroup, DateAvailabilityItem, DateAvailabilityQuery, DateAvailabilityQueryResult, GetProductTimeRangesRequest, ProductAvailabilityGroup, ProductAvailabilityItem, ProductAvailabilityQuery, ProductAvailabilityQueryResult, ProductTimeRange, ProductTimeRangeGroup, QueryAvailabilityBaseRequest, ResourceAvailabilityGroup, ResourceAvailabilityQuery, ResourceAvailabilityQueryResult, ResourceAvailabilityRangeGroup, TimeAvailabilityGroup, TimeAvailabilityItem, TimeAvailabilityQuery, TimeAvailabilityQueryResult, } from '../../modules/ResourcePlanner';
 export interface UnifiedBookingSalesState extends BookingTicketState {
 }
@@ -24,6 +28,12 @@ export declare enum UnifiedBookingSalesHooks {
 export interface UnifiedBookingSalesOtherParams extends Record<string, any> {
     enableSessionStoragePersist?: boolean;
 }
+export type UnifiedBookingSalesAllergyRequirement = AllergyRequirement;
+export interface UnifiedBookingSalesResolveProductAllergyRequirementParams {
+    productId: number | string;
+    productVariantId?: number | string;
+    channel?: string;
+}
 export interface UnifiedBookingSalesLoadOpenDataParams {
     businessCode: string;
     channel: string;
@@ -151,6 +161,8 @@ export interface ContextualCommitAvailabilitySelectionParams {
     requirementSelections: AvailabilityRequirementSelection[];
     partySize: number;
     bookingCount?: number;
+    /** 新增商品行时与商品、预约在同一次 Order mutation 内写入的 Sales Notes。 */
+    salesNotes?: SalesNoteDraftInput[];
     /** 编辑预约时，允许本次显式报价覆盖已落库订单行的历史价格。 */
     allowBookingReprice?: boolean;
     /** 编辑预约重报价后，允许订单模块重新应用已选编辑态折扣。 */
@@ -214,6 +226,7 @@ export interface UnifiedBookingSalesApi {
     /** Date-first calendar availability backed by ScheduleModule. */
     loadScheduleAvailableDate: (params: LoadScheduleAvailableDateParams) => Promise<unknown>;
     loadProductsByScheduleDate: (params: UnifiedBookingSalesLoadProductsByScheduleDateParams) => Promise<unknown[]>;
+    queryProducts: (params?: ProductListStoreQueryParams) => Promise<ProductData[]>;
     stageRetailProducts: (params: UnifiedBookingSalesStageRetailProductsParams) => Promise<Record<string, any> | null>;
     addRetailProduct: (params: UnifiedBookingSalesAddRetailProductParams) => Promise<Record<string, any>[]>;
     prepareAvailabilityProjection: (params: UnifiedBookingSalesPrepareAvailabilityProjectionParams) => Promise<AvailabilityContextRef>;

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

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

package/lib/solution/VenueBooking/index.js

@@ -1758,7 +1758,11 @@ class VenueBookingImpl 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/package.json

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