@pisell/pisellos 0.10.7 → 0.10.9

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

@@ -1,4 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
@@ -7,6 +6,7 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -24,7 +24,7 @@ import { DataVariantAdapter } from "./adapter";
 /**
  * Data Variant 评估器。
  *
- * 当前阶段只提供策略模型能力和示例验证，不接入 ProductList 业务链路。
+ * OS Server 商品路由开启时由 ProductsModule 调用；路由关闭时由 ProductList 在远端响应后调用。
  */
 export var DataVariantEvaluator = /*#__PURE__*/function () {
   function DataVariantEvaluator() {
@@ -51,7 +51,7 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     /**
      * 批量解析商品 Data Variant。
      *
-     * 先执行全局预计算，再只针对商品自身 data_variants 引用到的规则做商品级判断。
+     * 优先使用商品 metadata.data_variant_ids；缺少权威命中结果时才执行本地策略判断。
      */
   }, {
     key: "resolveProducts",
@@ -60,9 +60,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       var strategyConfigs = businessData.strategyConfigs ? this.normalizeStrategyConfigs(businessData.strategyConfigs) : this.strategyConfigs;
       var menuScopeMap = this.buildMenuScopeMap(businessData.menuList || []);
       var scheduleTimePoints = this.buildScheduleTimePoints(strategyConfigs, businessData.scheduleList || []);
-      var _this$buildGlobalEffe = this.buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap),
-        globalEffectiveRuleMap = _this$buildGlobalEffe.globalEffectiveRuleMap,
-        rawResults = _this$buildGlobalEffe.rawResults;
+      // metadata.data_variant_ids 存在时，接口已经完成规则计算；只有仍有商品缺少
+      // 该权威结果时才初始化本地策略引擎，避免 OS/接口与客户端重复评估。
+      var shouldEvaluateStrategies = businessData.products.some(function (product) {
+        return _this.requiresLocalStrategyEvaluation(product);
+      });
+      var _ref = shouldEvaluateStrategies ? this.buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap) : {
+          globalEffectiveRuleMap: new Map(),
+          rawResults: []
+        },
+        globalEffectiveRuleMap = _ref.globalEffectiveRuleMap,
+        rawResults = _ref.rawResults;
       var products = businessData.products.map(function (product) {
         var resolvedProduct = _this.resolveProduct(product, businessData, globalEffectiveRuleMap, menuScopeMap);
         // 套餐子商品也可能携带 data_variants，需在同一策略上下文内继续评估并写回 bundle_item。
@@ -180,6 +188,69 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       });
       return this.extractTimePointsFromSchedules(matchedSchedules);
     }
+
+    /**
+     * 判断商品（含套餐子商品）是否仍需要本地执行策略条件。
+     * metadata.data_variant_ids 只要是数组，即使为空，也表示接口已经给出权威命中结果。
+     */
+  }, {
+    key: "requiresLocalStrategyEvaluation",
+    value: function requiresLocalStrategyEvaluation(product) {
+      var _this2 = this;
+      var dataVariants = this.getProductDataVariants(product);
+      var hasConditionalVariant = dataVariants.some(function (variant) {
+        return Number(variant.data_variant_rule_id) !== 0;
+      });
+      if (hasConditionalVariant && this.getAuthoritativeVariantPriorities(product) === null) {
+        return true;
+      }
+      var bundleGroups = Array.isArray(product.bundle_group) ? product.bundle_group : [];
+      return bundleGroups.some(function (group) {
+        var bundleItems = Array.isArray(group === null || group === void 0 ? void 0 : group.bundle_item) ? group.bundle_item : [];
+        return bundleItems.some(function (item) {
+          return _this2.requiresLocalStrategyEvaluation(_this2.toBundleItemDataVariantProduct(item));
+        });
+      });
+    }
+
+    /**
+     * 将接口返回的高 -> 低优先级 Variant ID 转成数值优先级。
+     * 返回 null 表示接口没有提供该字段；空 Map 表示已计算但没有任何命中。
+     */
+  }, {
+    key: "getAuthoritativeVariantPriorities",
+    value: function getAuthoritativeVariantPriorities(product) {
+      var _product$metadata;
+      var rawIds = product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.data_variant_ids;
+      if (!Array.isArray(rawIds)) return null;
+      var orderedIds = [];
+      var seen = new Set();
+      var _iterator4 = _createForOfIteratorHelper(rawIds),
+        _step4;
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var rawId = _step4.value;
+          var id = this.normalizeDataVariantId(rawId);
+          if (id === null || seen.has(id)) continue;
+          seen.add(id);
+          orderedIds.push(id);
+        }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
+      }
+      return new Map(orderedIds.map(function (id, index) {
+        return [id, orderedIds.length - index];
+      }));
+    }
+  }, {
+    key: "normalizeDataVariantId",
+    value: function normalizeDataVariantId(value) {
+      if (value === undefined || value === null) return null;
+      var normalized = String(value).trim();
+      return normalized || null;
+    }
   }, {
     key: "buildGlobalEffectiveRuleMap",
     value: function buildGlobalEffectiveRuleMap(strategyConfigs, businessData, menuScopeMap) {
@@ -187,11 +258,11 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       var rawResults = [];
       var engine = this.createEngine(businessData, menuScopeMap);
       var context = this.adapter.prepareGlobalContext(businessData);
-      var _iterator4 = _createForOfIteratorHelper(strategyConfigs),
-        _step4;
+      var _iterator5 = _createForOfIteratorHelper(strategyConfigs),
+        _step5;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var config = _step4.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var config = _step5.value;
           if (!this.isStrategyActive(config)) continue;
           var _this$splitStrategyCo = this.splitStrategyConfig(config),
             globalConfig = _this$splitStrategyCo.globalConfig,
@@ -208,9 +279,9 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
       return {
         globalEffectiveRuleMap: globalEffectiveRuleMap,
@@ -223,11 +294,28 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       var dataVariants = this.getProductDataVariants(product);
       if (!dataVariants.length) return product;
       var matchedVariants = [];
-      var _iterator5 = _createForOfIteratorHelper(dataVariants),
-        _step5;
+      var authoritativeVariantPriorities = this.getAuthoritativeVariantPriorities(product);
+      var settlementVariants = dataVariants.filter(function (variant) {
+        return variant.business_type === 'multi_currency_settlement' && variant.status === 'enable';
+      });
+      var _iterator6 = _createForOfIteratorHelper(dataVariants),
+        _step6;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var variant = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var variant = _step6.value;
+          if (variant.business_type === 'multi_currency_settlement') continue;
+          if (authoritativeVariantPriorities !== null) {
+            var variantId = this.normalizeDataVariantId(variant.id);
+            var priority = variantId === null ? undefined : authoritativeVariantPriorities.get(variantId);
+            if (priority === undefined) continue;
+            matchedVariants.push({
+              ruleId: String(variant.data_variant_rule_id),
+              priority: priority,
+              data: variant.data || {},
+              variant: variant
+            });
+            continue;
+          }
           var rule = globalEffectiveRuleMap.get(String(variant.data_variant_rule_id));
           if (!rule) continue;
           if (!this.evaluateProductRules(rule, product, businessData, menuScopeMap)) {
@@ -241,12 +329,103 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           });
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
-      if (!matchedVariants.length) return product;
-      return this.mergeMatchedVariants(product, matchedVariants);
+      var resolvedProduct = matchedVariants.length ? this.mergeMatchedVariants(product, matchedVariants) : product;
+      var availableSettlementOptions = this.resolveSettlementOptions(settlementVariants, product, businessData, globalEffectiveRuleMap, menuScopeMap, authoritativeVariantPriorities);
+      if (!settlementVariants.length) return resolvedProduct;
+      return _objectSpread(_objectSpread({}, resolvedProduct), {}, {
+        available_settlement_options: availableSettlementOptions
+      });
+    }
+
+    /**
+     * 多货币 Data Variant 只生成候选列表，不参与商品字段覆盖。
+     * rule_id=0 是无条件默认价；同币种命中的条件价优先于默认价。
+     */
+  }, {
+    key: "resolveSettlementOptions",
+    value: function resolveSettlementOptions(variants, product, businessData, globalEffectiveRuleMap, menuScopeMap, authoritativeVariantPriorities) {
+      var _this3 = this;
+      if (!variants.length) return [];
+      var candidates = variants.flatMap(function (variant) {
+        var _variant$data, _variant$id, _variant$data$price, _variant$data2;
+        var settlement = (_variant$data = variant.data) === null || _variant$data === void 0 ? void 0 : _variant$data.multi_currency_settlement;
+        if (!settlement || _typeof(settlement) !== 'object') return [];
+        var ruleId = String(variant.data_variant_rule_id);
+        var isDefault = Number(variant.data_variant_rule_id) === 0;
+        var rule = isDefault ? undefined : globalEffectiveRuleMap.get(ruleId);
+        var variantId = _this3.normalizeDataVariantId(variant.id);
+        var authoritativePriority = variantId === null ? undefined : authoritativeVariantPriorities === null || authoritativeVariantPriorities === void 0 ? void 0 : authoritativeVariantPriorities.get(variantId);
+        var available;
+        var priority;
+        if (isDefault) {
+          // rule 0 是无条件默认候选，不依赖接口命中 ID 或本地策略引擎。
+          available = true;
+          priority = Number.NEGATIVE_INFINITY;
+        } else if (authoritativeVariantPriorities !== null) {
+          var _ref2;
+          // 数组存在（包括 []）即表示接口已经算过规则，不再在客户端二次判断。
+          available = authoritativePriority !== undefined;
+          priority = (_ref2 = authoritativePriority !== null && authoritativePriority !== void 0 ? authoritativePriority : rule === null || rule === void 0 ? void 0 : rule.priority) !== null && _ref2 !== void 0 ? _ref2 : Number.NEGATIVE_INFINITY;
+        } else {
+          var _rule$priority;
+          available = Boolean(rule && _this3.evaluateProductRules(rule, product, businessData, menuScopeMap));
+          priority = (_rule$priority = rule === null || rule === void 0 ? void 0 : rule.priority) !== null && _rule$priority !== void 0 ? _rule$priority : Number.NEGATIVE_INFINITY;
+        }
+        var settlementType = String(settlement.settlement_type || '');
+        var currencyProductId = _this3.toNumber(settlement.currency_product_id);
+        var settlementKey = settlementType === 'virtual_currency' ? "virtual_currency:".concat(currencyProductId || '') : settlementType || "variant:".concat((_variant$id = variant.id) !== null && _variant$id !== void 0 ? _variant$id : ruleId);
+        return [{
+          key: settlementKey,
+          priority: priority,
+          isDefault: isDefault,
+          option: _objectSpread(_objectSpread(_objectSpread({}, settlement), {}, {
+            settlement_type: settlementType
+          }, currencyProductId ? {
+            currency_product_id: currencyProductId
+          } : {}), {}, {
+            price: String((_variant$data$price = (_variant$data2 = variant.data) === null || _variant$data2 === void 0 ? void 0 : _variant$data2.price) !== null && _variant$data$price !== void 0 ? _variant$data$price : '0'),
+            data_variant_id: variant.id,
+            data_variant_rule_id: variant.data_variant_rule_id,
+            available: available,
+            disabled_reason: available ? '' : String(settlement.disabled_reason || 'Not available for this purchase.')
+          })
+        }];
+      });
+      var grouped = new Map();
+      var _iterator7 = _createForOfIteratorHelper(candidates),
+        _step7;
+      try {
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var candidate = _step7.value;
+          var group = grouped.get(candidate.key) || [];
+          group.push(candidate);
+          grouped.set(candidate.key, group);
+        }
+      } catch (err) {
+        _iterator7.e(err);
+      } finally {
+        _iterator7.f();
+      }
+      return Array.from(grouped.values()).map(function (group) {
+        var matchedConditional = group.filter(function (candidate) {
+          return !candidate.isDefault && candidate.option.available;
+        }).sort(function (a, b) {
+          return b.priority - a.priority;
+        })[0];
+        var defaultCandidate = group.find(function (candidate) {
+          return candidate.isDefault;
+        });
+        var unavailableCandidate = _toConsumableArray(group).filter(function (candidate) {
+          return !candidate.option.available;
+        }).sort(function (a, b) {
+          return b.priority - a.priority;
+        })[0];
+        return (matchedConditional || defaultCandidate || unavailableCandidate).option;
+      });
     }
 
     /**
@@ -257,7 +436,7 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "resolveProductBundleItems",
     value: function resolveProductBundleItems(product, businessData, globalEffectiveRuleMap, menuScopeMap) {
-      var _this2 = this;
+      var _this4 = this;
       var bundleGroups = product.bundle_group;
       if (!Array.isArray(bundleGroups) || bundleGroups.length === 0) {
         return product;
@@ -269,7 +448,7 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
         }
         return _objectSpread(_objectSpread({}, group), {}, {
           bundle_item: bundleItems.map(function (item) {
-            return _this2.resolveBundleItem(item, businessData, globalEffectiveRuleMap, menuScopeMap);
+            return _this4.resolveBundleItem(item, businessData, globalEffectiveRuleMap, menuScopeMap);
           })
         });
       });
@@ -298,16 +477,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "toBundleItemDataVariantProduct",
     value: function toBundleItemDataVariantProduct(item) {
-      var _item$bundle_product_, _ref, _ref2, _item$bundle_variant_;
+      var _item$bundle_product_, _ref3, _ref4, _item$bundle_variant_;
       var productId = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item.product_id;
-      var variantId = (_ref = (_ref2 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref2 !== void 0 ? _ref2 : item.product_variant_id) !== null && _ref !== void 0 ? _ref : 0;
+      var variantId = (_ref3 = (_ref4 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref4 !== void 0 ? _ref4 : item.product_variant_id) !== null && _ref3 !== void 0 ? _ref3 : 0;
       return {
         id: productId,
         product_id: productId,
         product_variant_id: variantId,
         variant_id: variantId,
         collection: item.collection,
-        data_variants: item.data_variants
+        data_variants: item.data_variants,
+        metadata: item.metadata
       };
     }
 
@@ -323,19 +503,19 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
         return originalItem;
       }
       var result = _objectSpread({}, originalItem);
-      var _iterator6 = _createForOfIteratorHelper(appliedInfo.appliedFields),
-        _step6;
+      var _iterator8 = _createForOfIteratorHelper(appliedInfo.appliedFields),
+        _step8;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var field = _step6.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var field = _step8.value;
           if (resolvedItem[field] !== undefined) {
             result[field] = resolvedItem[field];
           }
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator6.f();
+        _iterator8.f();
       }
       result._dataVariant = appliedInfo;
       return result;
@@ -375,11 +555,11 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           productRules: this.flattenConditionRules(conditions)
         };
       }
-      var _iterator7 = _createForOfIteratorHelper(conditions.rules),
-        _step7;
+      var _iterator9 = _createForOfIteratorHelper(conditions.rules),
+        _step9;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var rule = _step7.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var rule = _step9.value;
           if (this.isConditionGroup(rule)) {
             productRules.push.apply(productRules, _toConsumableArray(this.flattenConditionRules(rule)));
             continue;
@@ -391,9 +571,9 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator7.f();
+        _iterator9.f();
       }
       return {
         globalConfig: _objectSpread(_objectSpread({}, config), {}, {
@@ -409,16 +589,16 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "createEngine",
     value: function createEngine(businessData, menuScopeMap) {
-      var _this3 = this;
+      var _this5 = this;
       var operatorHandlers = {
         schedule_match: function schedule_match(fieldValue, compareValue) {
-          return _this3.evaluateScheduleMatch(fieldValue, compareValue, businessData.scheduleList || []);
+          return _this5.evaluateScheduleMatch(fieldValue, compareValue, businessData.scheduleList || []);
         },
         menu_match: function menu_match(fieldValue, compareValue) {
-          return _this3.evaluateMenuMatch(fieldValue, compareValue, menuScopeMap);
+          return _this5.evaluateMenuMatch(fieldValue, compareValue, menuScopeMap);
         },
         array_intersects: function array_intersects(fieldValue, compareValue) {
-          return _this3.evaluateArrayIntersects(fieldValue, compareValue);
+          return _this5.evaluateArrayIntersects(fieldValue, compareValue);
         }
       };
       return new StrategyEngine({
@@ -444,19 +624,19 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     value: function evaluateMenuMatch(fieldValue, compareValue, menuScopeMap) {
       var menuIds = this.normalizeNumberArray(compareValue);
       if (!menuIds.length) return true;
-      var _iterator8 = _createForOfIteratorHelper(menuIds),
-        _step8;
+      var _iterator10 = _createForOfIteratorHelper(menuIds),
+        _step10;
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var menuId = _step8.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var menuId = _step10.value;
           var scope = menuScopeMap.get(menuId);
           if (!scope) continue;
           if (this.isProductInMenuScope(fieldValue, scope)) return true;
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator8.f();
+        _iterator10.f();
       }
       return false;
     }
@@ -475,55 +655,55 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     key: "collectScheduleIdsFromStrategies",
     value: function collectScheduleIdsFromStrategies(strategyConfigs) {
       var scheduleIds = new Set();
-      var _iterator9 = _createForOfIteratorHelper(strategyConfigs),
-        _step9;
+      var _iterator11 = _createForOfIteratorHelper(strategyConfigs),
+        _step11;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var config = _step9.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var config = _step11.value;
           if (!this.isStrategyActive(config)) continue;
           var rules = this.flattenConditionRules(config.conditions);
-          var _iterator10 = _createForOfIteratorHelper(rules),
-            _step10;
+          var _iterator12 = _createForOfIteratorHelper(rules),
+            _step12;
           try {
-            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-              var rule = _step10.value;
+            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+              var rule = _step12.value;
               if (rule.operator !== 'schedule_match') continue;
-              var _iterator11 = _createForOfIteratorHelper(this.normalizeNumberArray(rule.value)),
-                _step11;
+              var _iterator13 = _createForOfIteratorHelper(this.normalizeNumberArray(rule.value)),
+                _step13;
               try {
-                for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-                  var scheduleId = _step11.value;
+                for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+                  var scheduleId = _step13.value;
                   scheduleIds.add(scheduleId);
                 }
               } catch (err) {
-                _iterator11.e(err);
+                _iterator13.e(err);
               } finally {
-                _iterator11.f();
+                _iterator13.f();
               }
             }
           } catch (err) {
-            _iterator10.e(err);
+            _iterator12.e(err);
           } finally {
-            _iterator10.f();
+            _iterator12.f();
           }
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator9.f();
+        _iterator11.f();
       }
       return Array.from(scheduleIds);
     }
   }, {
     key: "extractTimePointsFromSchedules",
     value: function extractTimePointsFromSchedules(schedules) {
-      var _this4 = this;
+      var _this6 = this;
       var timePoints = new Set();
-      var _iterator12 = _createForOfIteratorHelper(schedules),
-        _step12;
+      var _iterator14 = _createForOfIteratorHelper(schedules),
+        _step14;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var schedule = _step12.value;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var schedule = _step14.value;
           switch (schedule.type) {
             case 'standard':
               {
@@ -534,36 +714,36 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
             case 'time-slots':
               {
                 var slots = Array.isArray(schedule.time_slot) ? schedule.time_slot : [];
-                var _iterator13 = _createForOfIteratorHelper(slots),
-                  _step13;
+                var _iterator15 = _createForOfIteratorHelper(slots),
+                  _step15;
                 try {
-                  for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-                    var slot = _step13.value;
+                  for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+                    var slot = _step15.value;
                     this.addRawTimePoint(timePoints, slot.start_time);
                     this.addRawTimePoint(timePoints, slot.end_time);
                   }
                 } catch (err) {
-                  _iterator13.e(err);
+                  _iterator15.e(err);
                 } finally {
-                  _iterator13.f();
+                  _iterator15.f();
                 }
                 break;
               }
             case 'designation':
               {
                 var designations = Array.isArray(schedule.designation) ? schedule.designation : schedule.designation ? [schedule.designation] : [];
-                var _iterator14 = _createForOfIteratorHelper(designations),
-                  _step14;
+                var _iterator16 = _createForOfIteratorHelper(designations),
+                  _step16;
                 try {
-                  for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-                    var designation = _step14.value;
+                  for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+                    var designation = _step16.value;
                     this.addRawTimePoint(timePoints, designation.start_time);
                     this.addRawTimePoint(timePoints, designation.end_time);
                   }
                 } catch (err) {
-                  _iterator14.e(err);
+                  _iterator16.e(err);
                 } finally {
-                  _iterator14.f();
+                  _iterator16.f();
                 }
                 break;
               }
@@ -572,12 +752,12 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator12.f();
+        _iterator14.f();
       }
       return Array.from(timePoints).sort(function (a, b) {
-        return _this4.timeToMinutes(a) - _this4.timeToMinutes(b);
+        return _this6.timeToMinutes(a) - _this6.timeToMinutes(b);
       });
     }
   }, {
@@ -624,14 +804,14 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     key: "isProductInMenuScope",
     value: function isProductInMenuScope(product, scope) {
       var _product$id,
-        _this5 = this;
+        _this7 = this;
       if (scope.isAllProducts) return true;
       if (!product || _typeof(product) !== 'object') return false;
       var productId = this.toNumber((_product$id = product.id) !== null && _product$id !== void 0 ? _product$id : product.product_id);
       var variantId = this.toNumber(product.product_variant_id);
       var productKey = this.buildProductKey(productId, variantId);
       var collectionIds = Array.isArray(product.collection_ids) ? product.collection_ids.map(function (id) {
-        return _this5.toNumber(id);
+        return _this7.toNumber(id);
       }) : [];
       return collectionIds.some(function (id) {
         return scope.collectionIds.has(id);
@@ -640,6 +820,7 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "mergeMatchedVariants",
     value: function mergeMatchedVariants(product, matchedVariants) {
+      var _this8 = this;
       var original = _objectSpread({}, product);
       var sortedVariants = _toConsumableArray(matchedVariants).sort(function (a, b) {
         if (a.priority !== b.priority) return a.priority - b.priority;
@@ -648,11 +829,11 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       var result = _objectSpread({}, product);
       var appliedRuleIds = [];
       var appliedFields = new Set();
-      var _iterator15 = _createForOfIteratorHelper(sortedVariants),
-        _step15;
+      var _iterator17 = _createForOfIteratorHelper(sortedVariants),
+        _step17;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var matched = _step15.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var matched = _step17.value;
           for (var _i = 0, _Object$entries = Object.entries(matched.data); _i < _Object$entries.length; _i++) {
             var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
               key = _Object$entries$_i[0],
@@ -664,12 +845,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           appliedRuleIds.push(matched.ruleId);
         }
       } catch (err) {
-        _iterator15.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator15.f();
+        _iterator17.f();
       }
       result._dataVariant = {
         appliedRuleIds: appliedRuleIds,
+        appliedVariantIds: Array.from(new Set(_toConsumableArray(sortedVariants).reverse().map(function (matched) {
+          return _this8.normalizeDataVariantId(matched.variant.id);
+        }).filter(function (id) {
+          return id !== null;
+        }))),
         appliedFields: Array.from(appliedFields),
         original: original
       };
@@ -718,11 +904,11 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
     key: "flattenConditionRules",
     value: function flattenConditionRules(group) {
       var rules = [];
-      var _iterator16 = _createForOfIteratorHelper(group.rules),
-        _step16;
+      var _iterator18 = _createForOfIteratorHelper(group.rules),
+        _step18;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var rule = _step16.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var rule = _step18.value;
           if (this.isConditionGroup(rule)) {
             rules.push.apply(rules, _toConsumableArray(this.flattenConditionRules(rule)));
           } else {
@@ -730,9 +916,9 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator16.f();
+        _iterator18.f();
       }
       return rules;
     }
@@ -744,10 +930,10 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
   }, {
     key: "normalizeNumberArray",
     value: function normalizeNumberArray(value) {
-      var _this6 = this;
+      var _this9 = this;
       if (!Array.isArray(value)) return [];
       return value.map(function (item) {
-        return _this6.toNumber(item);
+        return _this9.toNumber(item);
       }).filter(function (item) {
         return item > 0;
       });