@pisell/pisellos 0.10.8 → 0.10.10

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

@@ -1,91 +1,163 @@
-import type { ResourcePlannerModule } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
-import type { ResourcePlannerAssignment, ResourcePlannerAssignableSlotResult, ResourcePlannerContextInput, ResourcePlannerProjection, ResourcePlannerQuery, ResourcePlannerSelectionPatch, ResourcePlannerSnapshot, ResourcePlannerValidationResult } from '../../modules/ResourcePlanner';
 import type { ProductListLoadProductsParams } from '../../modules/ProductList';
 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';
-export declare enum UnifiedBookingSalesHooks {
-    onPlannerContextLoaded = "unifiedBookingSales:onPlannerContextLoaded",
-    onPlannerCommitted = "unifiedBookingSales:onPlannerCommitted"
-}
+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 {
-    resourcePlanner: ResourcePlannerModule;
+}
+export declare enum UnifiedBookingSalesHooks {
+    onAvailabilityProjectionPrepared = "unifiedBookingSales:onAvailabilityProjectionPrepared",
+    onAvailabilitySelectionCommitted = "unifiedBookingSales:onAvailabilitySelectionCommitted",
+    onAvailabilityProjectionDiagnostic = "unifiedBookingSales:onAvailabilityProjectionDiagnostic"
 }
 export interface UnifiedBookingSalesOtherParams extends Record<string, any> {
-    /**
-     * Persist the active order workspace in sessionStorage, partitioned by cacheId.
-     * Disabled by default and ignored when cacheId is missing.
-     */
     enableSessionStoragePersist?: boolean;
 }
-/** Explicit OpenData target used by page-level UnifiedBookingSales skins. */
 export interface UnifiedBookingSalesLoadOpenDataParams {
     businessCode: string;
     channel: string;
-    /** Bypasses the target-scoped in-memory cache. */
     force?: boolean;
 }
-export interface UnifiedBookingSalesLoadPlannerContextParams extends ResourcePlannerQuery {
-    /** ProductList request options used only when products are not supplied as raw/context data. */
-    productLoadParams?: ProductListLoadProductsParams;
-    /** Escape hatch for tests or callers that already own raw ProductList records. */
-    rawProducts?: Record<string, any>[];
-    /** Escape hatch for tests or callers that already own raw resource records. */
-    rawResources?: Record<string, any>[];
-    /** Fully normalized Planner context; takes precedence over API loading for supplied fields. */
-    context?: ResourcePlannerContextInput;
-    /** Enables the v2 resource API + schedule materialization path. */
-    useResourceDateApi?: boolean;
-}
-export interface UnifiedBookingSalesCommitPlannerSelectionParams {
-    /** Optional selection patch applied before validation and order mutation. */
-    selection?: ResourcePlannerSelectionPatch;
-    /** Directly supplies selected resource/time facts, usually from resolveAssignableSlots(). */
-    assignments?: ResourcePlannerAssignment[];
-    /** Defaults to false. True performs the real BaseSales / OrderModule submit after tempOrder is written. */
-    submitAfterCommit?: boolean;
-}
 export interface UnifiedBookingSalesLoadProductsByScheduleDateParams extends Omit<ProductListLoadProductsParams, 'schedule_date' | 'product_ids'> {
-    /** The chosen calendar date, used for both availability lookup and ProductList schedule_date. */
     date: string;
-    /** Optional caller-side filter applied after the availability result produces its product pool. */
     product_ids?: number[];
-    /** Required by the availability API; this is not the low-code page id. */
     custom_page_id?: number;
-    /** Availability API channel, commonly pc. ProductList keeps its own sales application channel. */
     channel?: string;
 }
-export interface UnifiedBookingSalesStagePlannerProductsParams {
-    /** Products the customer selected before a time/resource booking exists. */
+export type UnifiedBookingSalesCatalogScope = {
+    type: 'schedule';
+    customPageId: number;
+    channel: string;
+} | {
+    type: 'productList';
+    params: ProductListLoadProductsParams;
+};
+export interface UnifiedBookingSalesPrepareAvailabilityProjectionParams {
+    productIds?: number[];
+    resourceIds?: AvailabilityId[];
+    dateRange?: Partial<AvailabilityDateRange>;
+    catalogScope?: UnifiedBookingSalesCatalogScope;
+    rawProducts?: Record<string, any>[];
+    rawResources?: Record<string, any>[];
+    rawOccupancies?: AvailabilityOccupancy[];
+    editingProductLineUids?: string[];
+    timezone?: string;
+    slotStepMinutes?: number;
+    businessHours?: {
+        startTime: string;
+        endTime: string;
+    };
+    mode?: 'appointment' | 'scan_order' | 'venue_grid';
+}
+export interface AvailabilityContextRef {
+    contextId: string;
+}
+export interface ContextualProductTimeRange extends ProductTimeRange {
+    availabilityContextId: string;
+    availabilityContextVersion: number;
+}
+export interface ContextualProductTimeRangeGroup extends Omit<ProductTimeRangeGroup, 'ranges'> {
+    ranges: ContextualProductTimeRange[];
+}
+export type ContextualAvailabilityQuery = Omit<Extract<AvailabilityQuery, {
+    target: 'product';
+}>, never> | Omit<Extract<AvailabilityQuery, {
+    target: 'date';
+}>, never> | (Omit<Extract<AvailabilityQuery, {
+    target: 'time';
+}>, 'candidates'> & {
+    candidates: ContextualProductTimeRange[];
+}) | (Omit<Extract<AvailabilityQuery, {
+    target: 'resource';
+}>, 'selectedRanges'> & {
+    selectedRanges: ContextualProductTimeRange[];
+});
+export type ContextualTimeAvailabilityItem = Omit<TimeAvailabilityItem, keyof ProductTimeRange> & ContextualProductTimeRange;
+export interface ContextualTimeAvailabilityGroup extends Omit<TimeAvailabilityGroup, 'times'> {
+    times: ContextualTimeAvailabilityItem[];
+}
+export interface ContextualResourceAvailabilityRangeGroup extends Omit<ResourceAvailabilityRangeGroup, 'range'> {
+    range: ContextualProductTimeRange;
+}
+export interface ContextualResourceAvailabilityGroup extends Omit<ResourceAvailabilityGroup, 'ranges'> {
+    ranges: ContextualResourceAvailabilityRangeGroup[];
+}
+type ContextualAvailabilityQueryResultMeta = {
+    contextId: string;
+    contextVersion: number;
+    refreshed: boolean;
+};
+export type ContextualAvailabilityQueryResult = (ProductAvailabilityQueryResult & ContextualAvailabilityQueryResultMeta) | (DateAvailabilityQueryResult & ContextualAvailabilityQueryResultMeta) | ({
+    target: 'time';
+    evaluatedAt: string;
+    snapshotId: string;
+    data: ContextualTimeAvailabilityGroup[];
+} & ContextualAvailabilityQueryResultMeta) | ({
+    target: 'resource';
+    evaluatedAt: string;
+    snapshotId: string;
+    data: ContextualResourceAvailabilityGroup[];
+} & ContextualAvailabilityQueryResultMeta);
+export type UnifiedBookingSalesAvailabilityCandidate = ContextualProductTimeRange;
+export type UnifiedBookingSalesProductTimeRangeGroup = ContextualProductTimeRangeGroup;
+export type UnifiedBookingSalesAvailabilityQueryResult = ContextualAvailabilityQueryResult;
+export interface UnifiedBookingSalesAvailabilityPreparedPayload {
+    context: AvailabilityContextRef;
+    contextVersion: number;
+    projection: AvailabilityProjection;
+    refreshed: boolean;
+    reason?: string;
+    previousOrderRevision?: AvailabilityId;
+}
+export interface UnifiedBookingSalesAvailabilityDiagnosticPayload {
+    contextId: string | null;
+    contextVersion: number | null;
+    reason: string;
+    projection: AvailabilityProjection | null;
+    action: 'prepare' | 'refresh' | 'release' | 'destroy' | 'set_other_params_reset' | 'commit_lock_wait' | 'commit_lock_acquired' | 'commit_lock_released';
+    snapshotId?: string;
+    orderRevision?: AvailabilityId;
+    previousOrderRevision?: AvailabilityId;
+    registrySize: number;
+    projectionPoolSize: number;
+}
+export interface UnifiedBookingSalesStageRetailProductsParams {
     productIds: Array<number | string>;
     productLoadParams?: ProductListLoadProductsParams;
     rawProducts?: Record<string, any>[];
 }
-/** Ordinary retail product staging. No resource, time, or booking facts are required. */
-export type UnifiedBookingSalesStageRetailProductsParams = UnifiedBookingSalesStagePlannerProductsParams;
-/** Adds one ordinary retail product without replacing other retail lines already in the cart. */
 export interface UnifiedBookingSalesAddRetailProductParams {
-    /** Prefer a supplied catalog record when the UI has already loaded it. */
     product?: Record<string, any>;
-    /** Used to resolve a product from the current catalog or load it on demand. */
     productId?: number | string;
-    /** Defaults to one. */
     quantity?: number;
-    /** Only used when the product is not already present in the solution catalog. */
     productLoadParams?: ProductListLoadProductsParams;
 }
-export interface UnifiedBookingSalesCommitResult {
+export interface ContextualCommitAvailabilitySelectionParams {
+    mode: 'add' | 'edit';
+    productLineUid?: string;
+    orderProduct: Record<string, any>;
+    candidate: ContextualProductTimeRange;
+    requirementSelections: AvailabilityRequirementSelection[];
+    partySize: number;
+    bookingCount?: number;
+}
+export type UnifiedBookingSalesCommitAvailabilitySelectionParams = ContextualCommitAvailabilitySelectionParams;
+export interface UnifiedBookingSalesCommitAvailabilitySelectionResult {
+    contextId: string;
+    contextVersion: number;
     tempOrder: Record<string, any> | null;
-    assignments: ResourcePlannerAssignment[];
-    validation: ResourcePlannerValidationResult;
-    submitResult?: unknown;
+    validation: AvailabilitySelectionValidationResult;
+    candidate: ContextualProductTimeRange;
+    productLineUid?: string;
+    bookingUid?: string;
+    productLineUids?: string[];
+    bookingUids?: string[];
 }
+export type UnifiedBookingSalesAvailabilityErrorCode = AvailabilityErrorCode;
 export interface UnifiedBookingSalesApplyPlannerDiscountsParams {
-    /** Customer whose cards/coupons should be loaded. Defaults to tempOrder.customer_id. */
     customerId?: number | string;
-    /** Optional explicit card/coupon id. When provided, Rules applies this card instead of auto-picking another card. */
     preferredDiscountId?: number | string;
-    /** Defaults to true: after loading eligible cards, let Rules choose the best valid combination. */
     applyBestDiscount?: boolean;
 }
 export interface UnifiedBookingSalesDiscountItem {
@@ -110,7 +182,6 @@ export interface UnifiedBookingSalesDiscountResult {
     status: 'applied' | 'loaded' | 'no_customer';
     customerId: number | null;
     preferredDiscountFound?: boolean;
-    /** True only when the requested card is both selected and written into a planner product line. */
     preferredDiscountApplied?: boolean;
     availableDiscounts: UnifiedBookingSalesDiscountItem[];
     selectedDiscounts: UnifiedBookingSalesDiscountItem[];
@@ -119,32 +190,18 @@ export interface UnifiedBookingSalesDiscountResult {
     summaryAfter?: unknown;
 }
 export interface UnifiedBookingSalesApi {
-    /** Loads board OpenData for a concrete business + channel target. */
     loadOpenData: (params: UnifiedBookingSalesLoadOpenDataParams) => Promise<OpenDataConfig>;
-    /** Returns the latest OpenData payload cached by this solution instance. */
-    getOpenData: () => OpenDataConfig | null;
-    /** Date-first calendar availability backed by ScheduleModule. */
+    getOpenData: () => Promise<OpenDataConfig | null>;
     loadScheduleAvailableDate: (params: LoadScheduleAvailableDateParams) => Promise<unknown>;
-    /** Date-first product pool derived from schedule date ids and globally sellable products. */
     loadProductsByScheduleDate: (params: UnifiedBookingSalesLoadProductsByScheduleDateParams) => Promise<unknown[]>;
-    /** Adds product lines only; booking creation is intentionally deferred. */
-    stagePlannerProducts: (params: UnifiedBookingSalesStagePlannerProductsParams) => Promise<Record<string, any> | null>;
-    /** Adds ordinary product lines only. It never creates bookings or invokes ResourcePlanner. */
     stageRetailProducts: (params: UnifiedBookingSalesStageRetailProductsParams) => Promise<Record<string, any> | null>;
-    /** Adds one ordinary retail line while preserving all existing cart lines. */
     addRetailProduct: (params: UnifiedBookingSalesAddRetailProductParams) => Promise<Record<string, any>[]>;
-    /** Loads and normalizes all IO data needed for the pure ResourcePlanner. */
-    loadPlannerContext: (params?: UnifiedBookingSalesLoadPlannerContextParams) => Promise<ResourcePlannerSnapshot>;
-    /** Reads continuous availability cells and UI-oriented aggregates. */
-    queryPlannerAvailability: (query?: ResourcePlannerQuery) => Promise<ResourcePlannerProjection>;
-    /** Produces selectable slots and the assignments required to commit them. */
-    resolveAssignableSlots: (query?: ResourcePlannerQuery) => ResourcePlannerAssignableSlotResult;
-    setPlannerSelection: (patch: ResourcePlannerSelectionPatch) => ResourcePlannerSnapshot;
-    autoAssignPlanner: (query?: ResourcePlannerQuery) => Promise<ResourcePlannerSnapshot>;
-    validatePlannerSelection: () => ResourcePlannerValidationResult;
-    /** Validates, writes to tempOrder, and only optionally makes a real submit request. */
-    commitPlannerSelection: (params?: UnifiedBookingSalesCommitPlannerSelectionParams) => Promise<UnifiedBookingSalesCommitResult>;
-    /** Loads the current customer's cards/coupons, optionally applies the best one, and reports line applications. */
+    prepareAvailabilityProjection: (params: UnifiedBookingSalesPrepareAvailabilityProjectionParams) => Promise<AvailabilityContextRef>;
+    getProductTimeRanges: (contextId: string, request?: GetProductTimeRangesRequest) => Promise<ContextualProductTimeRangeGroup[]>;
+    queryBookingAvailability: (contextId: string, request: ContextualAvailabilityQuery) => Promise<ContextualAvailabilityQueryResult>;
+    commitAvailabilitySelection: (contextId: string, params: ContextualCommitAvailabilitySelectionParams) => Promise<UnifiedBookingSalesCommitAvailabilitySelectionResult>;
+    releaseAvailabilityContext: (contextId: string) => void;
     applyPlannerDiscounts: (params?: UnifiedBookingSalesApplyPlannerDiscountsParams) => Promise<UnifiedBookingSalesDiscountResult>;
-    getPlannerSnapshot: () => ResourcePlannerSnapshot;
 }
+export type UnifiedBookingSalesNormalizedProduct = AvailabilityProduct;
+export type UnifiedBookingSalesNormalizedResource = AvailabilityResource;

package/dist/solution/UnifiedBookingSales/types.js

@@ -1,11 +1,6 @@
 export var UnifiedBookingSalesHooks = /*#__PURE__*/function (UnifiedBookingSalesHooks) {
-  UnifiedBookingSalesHooks["onPlannerContextLoaded"] = "unifiedBookingSales:onPlannerContextLoaded";
-  UnifiedBookingSalesHooks["onPlannerCommitted"] = "unifiedBookingSales:onPlannerCommitted";
+  UnifiedBookingSalesHooks["onAvailabilityProjectionPrepared"] = "unifiedBookingSales:onAvailabilityProjectionPrepared";
+  UnifiedBookingSalesHooks["onAvailabilitySelectionCommitted"] = "unifiedBookingSales:onAvailabilitySelectionCommitted";
+  UnifiedBookingSalesHooks["onAvailabilityProjectionDiagnostic"] = "unifiedBookingSales:onAvailabilityProjectionDiagnostic";
   return UnifiedBookingSalesHooks;
-}({});
-
-/** Explicit OpenData target used by page-level UnifiedBookingSales skins. */
-
-/** Ordinary retail product staging. No resource, time, or booking facts are required. */
-
-/** Adds one ordinary retail product without replacing other retail lines already in the cart. */
+}({});

package/lib/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/model/strategy/adapter/dataVariant/evaluator.d.ts

@@ -3,7 +3,7 @@ import type { ConditionScope, DataVariantBusinessData, DataVariantMenu, DataVari
 /**
  * Data Variant 评估器。
  *
- * 当前阶段只提供策略模型能力和示例验证，不接入 ProductList 业务链路。
+ * OS Server 商品路由开启时由 ProductsModule 调用；路由关闭时由 ProductList 在远端响应后调用。
  */
 export declare class DataVariantEvaluator {
     private adapter;
@@ -17,7 +17,7 @@ export declare class DataVariantEvaluator {
     /**
      * 批量解析商品 Data Variant。
      *
-     * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
+     * 优先使用商品 metadata.data_variant_ids；缺少权威命中结果时才执行本地策略判断。
      */
     resolveProducts(businessData: DataVariantBusinessData): ResolvedDataVariantResult;
     /**
@@ -34,8 +34,24 @@ export declare class DataVariantEvaluator {
      * 这里不依赖餐牌，只读取策略配置和调用方传入的 scheduleList。
      */
     buildScheduleTimePoints(strategyConfigs: StrategyConfig<DataVariantRuleMetadata>[], scheduleList: NonNullable<DataVariantBusinessData['scheduleList']>): string[];
+    /**
+     * 判断商品（含套餐子商品）是否仍需要本地执行策略条件。
+     * metadata.data_variant_ids 只要是数组，即使为空，也表示接口已经给出权威命中结果。
+     */
+    private requiresLocalStrategyEvaluation;
+    /**
+     * 将接口返回的高 -> 低优先级 Variant ID 转成数值优先级。
+     * 返回 null 表示接口没有提供该字段；空 Map 表示已计算但没有任何命中。
+     */
+    private getAuthoritativeVariantPriorities;
+    private normalizeDataVariantId;
     private buildGlobalEffectiveRuleMap;
     private resolveProduct;
+    /**
+     * 多货币 Data Variant 只生成候选列表，不参与商品字段覆盖。
+     * rule_id=0 是无条件默认价；同币种命中的条件价优先于默认价。
+     */
+    private resolveSettlementOptions;
     /**
      * 解析套餐子商品上的 Data Variant 覆盖。
      *

package/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -43,7 +43,7 @@ var DataVariantEvaluator = class {
   /**
    * 批量解析商品 Data Variant。
    *
-   * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
+   * 优先使用商品 metadata.data_variant_ids；缺少权威命中结果时才执行本地策略判断。
    */
   resolveProducts(businessData) {
     const strategyConfigs = businessData.strategyConfigs ? this.normalizeStrategyConfigs(businessData.strategyConfigs) : this.strategyConfigs;
@@ -52,11 +52,17 @@ var DataVariantEvaluator = class {
       strategyConfigs,
       businessData.scheduleList || []
     );
-    const { globalEffectiveRuleMap, rawResults } = this.buildGlobalEffectiveRuleMap(
+    const shouldEvaluateStrategies = businessData.products.some(
+      (product) => this.requiresLocalStrategyEvaluation(product)
+    );
+    const { globalEffectiveRuleMap, rawResults } = shouldEvaluateStrategies ? this.buildGlobalEffectiveRuleMap(
       strategyConfigs,
       businessData,
       menuScopeMap
-    );
+    ) : {
+      globalEffectiveRuleMap: /* @__PURE__ */ new Map(),
+      rawResults: []
+    };
     const products = businessData.products.map((product) => {
       const resolvedProduct = this.resolveProduct(
         product,
@@ -154,6 +160,56 @@ var DataVariantEvaluator = class {
     );
     return this.extractTimePointsFromSchedules(matchedSchedules);
   }
+  /**
+   * 判断商品（含套餐子商品）是否仍需要本地执行策略条件。
+   * metadata.data_variant_ids 只要是数组，即使为空，也表示接口已经给出权威命中结果。
+   */
+  requiresLocalStrategyEvaluation(product) {
+    const dataVariants = this.getProductDataVariants(product);
+    const hasConditionalVariant = dataVariants.some(
+      (variant) => Number(variant.data_variant_rule_id) !== 0
+    );
+    if (hasConditionalVariant && this.getAuthoritativeVariantPriorities(product) === null) {
+      return true;
+    }
+    const bundleGroups = Array.isArray(product.bundle_group) ? product.bundle_group : [];
+    return bundleGroups.some((group) => {
+      const bundleItems = Array.isArray(group == null ? void 0 : group.bundle_item) ? group.bundle_item : [];
+      return bundleItems.some(
+        (item) => this.requiresLocalStrategyEvaluation(
+          this.toBundleItemDataVariantProduct(item)
+        )
+      );
+    });
+  }
+  /**
+   * 将接口返回的高 -> 低优先级 Variant ID 转成数值优先级。
+   * 返回 null 表示接口没有提供该字段；空 Map 表示已计算但没有任何命中。
+   */
+  getAuthoritativeVariantPriorities(product) {
+    var _a;
+    const rawIds = (_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.data_variant_ids;
+    if (!Array.isArray(rawIds))
+      return null;
+    const orderedIds = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const rawId of rawIds) {
+      const id = this.normalizeDataVariantId(rawId);
+      if (id === null || seen.has(id))
+        continue;
+      seen.add(id);
+      orderedIds.push(id);
+    }
+    return new Map(
+      orderedIds.map((id, index) => [id, orderedIds.length - index])
+    );
+  }
+  normalizeDataVariantId(value) {
+    if (value === void 0 || value === null)
+      return null;
+    const normalized = String(value).trim();
+    return normalized || null;
+  }
   buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap) {
     const globalEffectiveRuleMap = /* @__PURE__ */ new Map();
     const rawResults = [];
@@ -182,7 +238,26 @@ var DataVariantEvaluator = class {
     if (!dataVariants.length)
       return product;
     const matchedVariants = [];
+    const authoritativeVariantPriorities = this.getAuthoritativeVariantPriorities(product);
+    const settlementVariants = dataVariants.filter(
+      (variant) => variant.business_type === "multi_currency_settlement" && variant.status === "enable"
+    );
     for (const variant of dataVariants) {
+      if (variant.business_type === "multi_currency_settlement")
+        continue;
+      if (authoritativeVariantPriorities !== null) {
+        const variantId = this.normalizeDataVariantId(variant.id);
+        const priority = variantId === null ? void 0 : authoritativeVariantPriorities.get(variantId);
+        if (priority === void 0)
+          continue;
+        matchedVariants.push({
+          ruleId: String(variant.data_variant_rule_id),
+          priority,
+          data: variant.data || {},
+          variant
+        });
+        continue;
+      }
       const rule = globalEffectiveRuleMap.get(
         String(variant.data_variant_rule_id)
       );
@@ -198,9 +273,91 @@ var DataVariantEvaluator = class {
         variant
       });
     }
-    if (!matchedVariants.length)
-      return product;
-    return this.mergeMatchedVariants(product, matchedVariants);
+    const resolvedProduct = matchedVariants.length ? this.mergeMatchedVariants(product, matchedVariants) : product;
+    const availableSettlementOptions = this.resolveSettlementOptions(
+      settlementVariants,
+      product,
+      businessData,
+      globalEffectiveRuleMap,
+      menuScopeMap,
+      authoritativeVariantPriorities
+    );
+    if (!settlementVariants.length)
+      return resolvedProduct;
+    return {
+      ...resolvedProduct,
+      available_settlement_options: availableSettlementOptions
+    };
+  }
+  /**
+   * 多货币 Data Variant 只生成候选列表，不参与商品字段覆盖。
+   * rule_id=0 是无条件默认价；同币种命中的条件价优先于默认价。
+   */
+  resolveSettlementOptions(variants, product, businessData, globalEffectiveRuleMap, menuScopeMap, authoritativeVariantPriorities) {
+    if (!variants.length)
+      return [];
+    const candidates = variants.flatMap((variant) => {
+      var _a, _b;
+      const settlement = (_a = variant.data) == null ? void 0 : _a.multi_currency_settlement;
+      if (!settlement || typeof settlement !== "object")
+        return [];
+      const ruleId = String(variant.data_variant_rule_id);
+      const isDefault = Number(variant.data_variant_rule_id) === 0;
+      const rule = isDefault ? void 0 : globalEffectiveRuleMap.get(ruleId);
+      const variantId = this.normalizeDataVariantId(variant.id);
+      const authoritativePriority = variantId === null ? void 0 : authoritativeVariantPriorities == null ? void 0 : authoritativeVariantPriorities.get(variantId);
+      let available;
+      let priority;
+      if (isDefault) {
+        available = true;
+        priority = Number.NEGATIVE_INFINITY;
+      } else if (authoritativeVariantPriorities !== null) {
+        available = authoritativePriority !== void 0;
+        priority = authoritativePriority ?? (rule == null ? void 0 : rule.priority) ?? Number.NEGATIVE_INFINITY;
+      } else {
+        available = Boolean(
+          rule && this.evaluateProductRules(
+            rule,
+            product,
+            businessData,
+            menuScopeMap
+          )
+        );
+        priority = (rule == null ? void 0 : rule.priority) ?? Number.NEGATIVE_INFINITY;
+      }
+      const settlementType = String(settlement.settlement_type || "");
+      const currencyProductId = this.toNumber(settlement.currency_product_id);
+      const settlementKey = settlementType === "virtual_currency" ? `virtual_currency:${currencyProductId || ""}` : settlementType || `variant:${variant.id ?? ruleId}`;
+      return [{
+        key: settlementKey,
+        priority,
+        isDefault,
+        option: {
+          ...settlement,
+          settlement_type: settlementType,
+          ...currencyProductId ? { currency_product_id: currencyProductId } : {},
+          price: String(((_b = variant.data) == null ? void 0 : _b.price) ?? "0"),
+          data_variant_id: variant.id,
+          data_variant_rule_id: variant.data_variant_rule_id,
+          available,
+          disabled_reason: available ? "" : String(
+            settlement.disabled_reason || "Not available for this purchase."
+          )
+        }
+      }];
+    });
+    const grouped = /* @__PURE__ */ new Map();
+    for (const candidate of candidates) {
+      const group = grouped.get(candidate.key) || [];
+      group.push(candidate);
+      grouped.set(candidate.key, group);
+    }
+    return Array.from(grouped.values()).map((group) => {
+      const matchedConditional = group.filter((candidate) => !candidate.isDefault && candidate.option.available).sort((a, b) => b.priority - a.priority)[0];
+      const defaultCandidate = group.find((candidate) => candidate.isDefault);
+      const unavailableCandidate = [...group].filter((candidate) => !candidate.option.available).sort((a, b) => b.priority - a.priority)[0];
+      return (matchedConditional || defaultCandidate || unavailableCandidate).option;
+    });
   }
   /**
    * 解析套餐子商品上的 Data Variant 覆盖。
@@ -262,7 +419,8 @@ var DataVariantEvaluator = class {
       product_variant_id: variantId,
       variant_id: variantId,
       collection: item.collection,
-      data_variants: item.data_variants
+      data_variants: item.data_variants,
+      metadata: item.metadata
     };
   }
   /**
@@ -501,6 +659,11 @@ var DataVariantEvaluator = class {
     }
     result._dataVariant = {
       appliedRuleIds,
+      appliedVariantIds: Array.from(
+        new Set(
+          [...sortedVariants].reverse().map((matched) => this.normalizeDataVariantId(matched.variant.id)).filter((id) => id !== null)
+        )
+      ),
       appliedFields: Array.from(appliedFields),
       original
     };

package/lib/model/strategy/adapter/dataVariant/type.d.ts

@@ -35,6 +35,10 @@ export interface DataVariantItem {
     module_data_id?: number;
     /** 关联策略模型 metadata.id / data_variant_rule.id */
     data_variant_rule_id: number | string;
+    /** 业务类型；多货币结算候选不会走普通字段覆盖 */
+    business_type?: 'multi_currency_settlement' | string;
+    /** 数据状态；多货币结算仅处理 enable 记录 */
+    status?: 'enable' | 'disable' | string;
     /** 命中策略后需要覆盖到商品上的字段 */
     data: Record<string, any>;
     created_at?: string | null;
@@ -53,11 +57,30 @@ export interface DataVariantProduct {
         id?: number | string;
         [key: string]: any;
     }>;
+    /**
+     * 商品接口已经完成规则计算时返回的命中结果。
+     * 数组按 Data Variant 优先级从高到低排列；空数组表示已计算但无命中。
+     */
+    metadata?: {
+        data_variant_ids?: Array<number | string>;
+        [key: string]: any;
+    };
     /** 后端 /product/query with dataVariants 返回的智能定价变体列表 */
     data_variants?: DataVariantItem[];
+    /** 当前上下文解析后的可选结算货币，不覆盖商品原始多货币配置 */
+    available_settlement_options?: AvailableSettlementOption[];
     _dataVariant?: DataVariantAppliedInfo;
     [key: string]: any;
 }
+export interface AvailableSettlementOption extends Record<string, any> {
+    settlement_type: 'legal_currency' | 'virtual_currency' | string;
+    currency_product_id?: number;
+    price: string;
+    data_variant_id?: number;
+    data_variant_rule_id: number | string;
+    available: boolean;
+    disabled_reason?: string;
+}
 /**
  * 餐牌商品配置项。
  */
@@ -131,6 +154,8 @@ export interface MatchedDataVariant {
  */
 export interface DataVariantAppliedInfo {
     appliedRuleIds: string[];
+    /** 本地策略实际应用的 Data Variant ID，按优先级从高到低排列。 */
+    appliedVariantIds?: Array<number | string>;
     appliedFields: string[];
     original: DataVariantProduct;
 }

package/lib/model/strategy/adapter/walletPass/evaluator.js

@@ -214,7 +214,6 @@ var WalletPassEvaluator = class {
         }
         const rawText = this.getText(reasonCode);
         const currency = failedField && AMOUNT_FIELDS.has(failedField) ? ((_g = (_f = this.otherParams) == null ? void 0 : _f.getData) == null ? void 0 : _g.call(_f, "shop_symbol")) || "" : "";
-        console.log(currency, "currency12345");
         const reason = thresholdValue !== void 0 ? formatReason(rawText, thresholdValue, currency) : rawText;
         results.push({
           voucher,
@@ -416,7 +415,6 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -26,6 +26,11 @@ export interface Voucher {
     recommended_usage_amount: number;
     /** 后端计算推荐使用金额（仅商品） 不包含税费附加费 */
     recommended_pure_product_usage_amount: number;
+    /**
+     * 扫码资产自身可供前端重新计算的金额基准。
+     * 后端 recommended_usage_amount 会包含当前已选券上下文，取消勾选后不能继续把它当作资产永久上限。
+     */
+    _wallet_asset_recalculation_base_amount?: number;
     /** 实际抵扣金额 */
     actualDeduction: number;
     /** 抵扣详情 */