@pisell/pisellos 0.10.8 → 0.10.9

package/dist/solution/BookingTicket/utils/addProductDecision.js

@@ -318,7 +318,7 @@ export function transformDetailToProductAndBooking(cacheItem, ctx) {
  * 把 cacheItem._extend.other 中的字段 + 顶层运行态拼成 `BaseProductDetailPayload`。
  */
 function buildBasePayloadFromCacheItem(cacheItem, ctx) {
-  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2;
+  var _cacheItem$_extend, _cacheItem$_extend$qu, _cacheItem$_extend2, _cacheItem$product_id, _cacheItem$id, _ref5, _other$product_varian, _extend$skuValue, _extend$_skuValue, _extend$price, _extend$price2, _cacheItem$metadata$s, _cacheItem$metadata, _extend$metadata;
   var other = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.other) || {};
   var quantity = (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : 1;
   var resolvedPid = (_cacheItem$product_id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id) !== null && _cacheItem$product_id !== void 0 ? _cacheItem$product_id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id;
@@ -347,6 +347,7 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     bundle_edit: extend === null || extend === void 0 ? void 0 : extend.bundle_edit,
     discount_reason: extend === null || extend === void 0 ? void 0 : extend.discount_reason,
     discount_list: cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list,
+    selected_settlement_snapshot: (_cacheItem$metadata$s = cacheItem === null || cacheItem === void 0 || (_cacheItem$metadata = cacheItem.metadata) === null || _cacheItem$metadata === void 0 ? void 0 : _cacheItem$metadata.selected_settlement_snapshot) !== null && _cacheItem$metadata$s !== void 0 ? _cacheItem$metadata$s : extend === null || extend === void 0 || (_extend$metadata = extend.metadata) === null || _extend$metadata === void 0 ? void 0 : _extend$metadata.selected_settlement_snapshot,
     _extend: extend
   };
 }

package/dist/solution/ScanOrder/index.js

@@ -2757,10 +2757,6 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           ruleProductsForResource,
           occupancyMinutes,
           paxBounds,
-          error,
-          _occupancyMinutes,
-          _paxBounds,
-          _error,
           occupyDetails,
           occupyDetail,
           resourceSelectType,
@@ -2903,59 +2899,24 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               });
             case 46:
               loaded = _context37.sent;
-              if (Array.isArray(loaded)) {
-                matchedRuleProduct = findReservationRuleProductByResourceId(loaded, normalizedResourceId);
-                ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
-                this.enabledReservationRuleProducts = ruleProductsForResource;
-                occupancyMinutes = pickFirstDurationMinutesFromProducts(ruleProductsForResource);
-                if (occupancyMinutes !== undefined) {
-                  tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
-                }
-                if (hasCustomCapacityProduct(ruleProductsForResource)) {
-                  pendingRequestEntryPax = 1;
-                  paxBounds = pickFirstCustomCapacityPaxBounds(ruleProductsForResource);
-                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.min) !== undefined) pendingRequestPaxMin = paxBounds.min;
-                  if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.max) !== undefined) pendingRequestPaxMax = paxBounds.max;
-                }
-              } else {
-                this.enabledReservationRuleProducts = [];
-                error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
-                this.logMethodError('loadReservationRuleProducts', error, {
-                  resourceId: normalizedResourceId,
-                  reservationLinkIds: reservationLinkIds,
-                  scheduleDate: scheduleDate,
-                  scheduleDatetime: scheduleDatetime,
-                  cacheId: this.cacheId
-                });
-                if (Array.isArray(loaded)) {
-                  this.enabledReservationRuleProducts = loaded;
-                  _occupancyMinutes = pickFirstDurationMinutesFromProducts(loaded);
-                  if (_occupancyMinutes !== undefined) {
-                    tempOrder.metadata.table_occupancy_duration = _occupancyMinutes;
-                  }
-                  if (hasCustomCapacityProduct(loaded)) {
-                    pendingRequestEntryPax = 1;
-                    _paxBounds = pickFirstCustomCapacityPaxBounds(loaded);
-                    if ((_paxBounds === null || _paxBounds === void 0 ? void 0 : _paxBounds.min) !== undefined) pendingRequestPaxMin = _paxBounds.min;
-                    if ((_paxBounds === null || _paxBounds === void 0 ? void 0 : _paxBounds.max) !== undefined) pendingRequestPaxMax = _paxBounds.max;
-                  }
-                } else {
-                  this.enabledReservationRuleProducts = [];
-                  _error = loaded instanceof Error ? loaded : new Error('预约规则商品列表接口返回异常');
-                  this.logMethodError('loadReservationRuleProducts', _error, {
-                    resourceId: resourceId,
-                    reservationLinkIds: reservationLinkIds,
-                    scheduleDate: scheduleDate,
-                    scheduleDatetime: scheduleDatetime,
-                    cacheId: this.cacheId
-                  });
-                }
+              matchedRuleProduct = findReservationRuleProductByResourceId(loaded, normalizedResourceId);
+              ruleProductsForResource = matchedRuleProduct ? [matchedRuleProduct] : [];
+              this.enabledReservationRuleProducts = ruleProductsForResource;
+              occupancyMinutes = pickFirstDurationMinutesFromProducts(ruleProductsForResource);
+              if (occupancyMinutes !== undefined) {
+                tempOrder.metadata.table_occupancy_duration = occupancyMinutes;
+              }
+              if (hasCustomCapacityProduct(ruleProductsForResource)) {
+                pendingRequestEntryPax = 1;
+                paxBounds = pickFirstCustomCapacityPaxBounds(ruleProductsForResource);
+                if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.min) !== undefined) pendingRequestPaxMin = paxBounds.min;
+                if ((paxBounds === null || paxBounds === void 0 ? void 0 : paxBounds.max) !== undefined) pendingRequestPaxMax = paxBounds.max;
               }
 
               // Step2: 请求新的资源占用详情接口。occupy_details 第一维是资源，不是订单。
-              _context37.next = 50;
+              _context37.next = 55;
               return this.fetchResourceOccupyDetailsByResourceId(normalizedResourceId);
-            case 50:
+            case 55:
               occupyDetails = _context37.sent;
               occupyDetail = (_occupyDetails$ = occupyDetails[0]) !== null && _occupyDetails$ !== void 0 ? _occupyDetails$ : null; // Step3: 结合预约规则商品的 product_resource.resources 与占用接口返回的 form_id，
               // 计算当前桌台的 resourceSelectType（single/multiple/capacity）
@@ -2963,7 +2924,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               allowAddItems = toBoolean(dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['sale.allow_add_items']);
               additionalOrderResult = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(additionalOrderResult.reason === 'multiple_orders')) {
-                _context37.next = 61;
+                _context37.next = 66;
                 break;
               }
               multipleOrdersState = _objectSpread(_objectSpread({}, this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId)), {}, {
@@ -2984,7 +2945,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 resourceSelectType: resourceSelectType
               });
               return _context37.abrupt("return", _availabilityInfo);
-            case 61:
+            case 66:
               // Step4: 用 occupyDetail + resourceSelectType 规整为 resourceState
               resourceState = this.normalizeResourceState(occupyDetail, resourceSelectType, hasOrderId);
               additionalOrderId = additionalOrderResult.order_id;
@@ -3030,12 +2991,12 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
 
               // 空闲状态下自动准备本地临时订单，供后续“购物车式”商品操作使用
               if (!(availabilityInfo.mode === 'idle')) {
-                _context37.next = 73;
+                _context37.next = 78;
                 break;
               }
-              _context37.next = 73;
+              _context37.next = 78;
               return this.addNewOrder();
-            case 73:
+            case 78:
               isAdditionalOrderMode = availabilityInfo.mode === 'additional_order' || availabilityInfo.mode === 'additional_order_with_code'; // 如果是加单模式，tempOrder 里需要记录目标订单 id，提交的时候走加单接口
               if (isAdditionalOrderMode) {
                 tempOrder.order_id = additionalOrderId;
@@ -3051,13 +3012,13 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 } : {}));
                 return acc;
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
-              _context37.next = 79;
+              _context37.next = 84;
               return this.setItemRuleRuntimeConfig({
                 serviceType: (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
-            case 79:
+            case 84:
               // operating_hours 超出营业时段 + closed_behavior=show_menu_disabled：
               // 允许浏览商品但 UI 层需拦截“下一步”，这里覆盖最终 mode 并回传错误提示
               if (outsideOperatingHours && closedBehaviorValue === 'show_menu_disabled') {
@@ -3079,18 +3040,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 isFull: resourceState.isFull
               });
               return _context37.abrupt("return", availabilityInfo);
-            case 84:
-              _context37.prev = 84;
+            case 89:
+              _context37.prev = 89;
               _context37.t0 = _context37["catch"](3);
               this.logMethodError('checkResourceAvailable', _context37.t0.message, {
                 resourceId: normalizedResourceId
               });
               throw _context37.t0;
-            case 88:
+            case 93:
             case "end":
               return _context37.stop();
           }
-        }, _callee37, this, [[3, 84]]);
+        }, _callee37, this, [[3, 89]]);
       }));
       function checkResourceAvailable(_x20) {
         return _checkResourceAvailable.apply(this, arguments);

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;
     /** 抵扣详情 */