@pisell/pisellos 2.3.165 → 2.3.166

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

@@ -269,6 +269,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       var productResults = this.evaluateProducts(input);
 
       // 2. 收集所有适用的促销（去重）
+      // strategyId is metadata and is not guaranteed to be unique. Use the actual
+      // configuration as the key so one strategy cannot overwrite another strategy's
+      // label/action when their IDs happen to be the same.
       var promotionMap = new Map();
       var _iterator3 = _createForOfIteratorHelper(productResults),
         _step3;
@@ -280,7 +283,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           try {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var promo = _step4.value;
-              var existing = promotionMap.get(promo.strategyId);
+              var existing = promotionMap.get(promo.strategyConfig);
               var product = productResult.product;
 
               // 计算促销数量：如果是 bundle 子商品匹配，数量 = 主商品数量 × 子商品数量
@@ -303,7 +306,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
                 // 新促销
                 var productMatchedBundleIndexMap = new Map();
                 productMatchedBundleIndexMap.set(product.id, promo.matchedBundleIndex);
-                promotionMap.set(promo.strategyId, _objectSpread(_objectSpread({}, promo), {}, {
+                promotionMap.set(promo.strategyConfig, _objectSpread(_objectSpread({}, promo), {}, {
                   applicableProducts: [product],
                   totalQuantity: promoQuantity,
                   totalAmount: product.price * product.quantity,
@@ -367,7 +370,7 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       var cartResult = this.evaluateCart(input);
 
       // 2. 按 action priority 排序促销组（从 strategyConfig 获取 priority）
-      var sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups, cartResult.applicablePromotions);
+      var sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups);
 
       // 3. 追踪已处理的商品（避免重复处理）
       // key: `${product_id}_${product_variant_id}`
@@ -664,30 +667,12 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
      */
   }, {
     key: "sortPromotionGroupsByPriority",
-    value: function sortPromotionGroupsByPriority(groups, promotions) {
-      // 创建策略ID到优先级的映射
-      var priorityMap = new Map();
-      var _iterator9 = _createForOfIteratorHelper(promotions),
-        _step9;
-      try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var _promo$strategyConfig2, _actions$0$priority, _actions$;
-          var promo = _step9.value;
-          var actions = ((_promo$strategyConfig2 = promo.strategyConfig) === null || _promo$strategyConfig2 === void 0 ? void 0 : _promo$strategyConfig2.actions) || [];
-          var priority = (_actions$0$priority = (_actions$ = actions[0]) === null || _actions$ === void 0 ? void 0 : _actions$.priority) !== null && _actions$0$priority !== void 0 ? _actions$0$priority : 999;
-          priorityMap.set(promo.strategyId, priority);
-        }
-
-        // 按优先级排序（数值越小优先级越高）
-      } catch (err) {
-        _iterator9.e(err);
-      } finally {
-        _iterator9.f();
-      }
+    value: function sortPromotionGroupsByPriority(groups) {
+      // 按优先级排序（数值越小优先级越高）
       return _toConsumableArray(groups).sort(function (a, b) {
-        var _priorityMap$get, _priorityMap$get2;
-        var priorityA = (_priorityMap$get = priorityMap.get(a.strategyId)) !== null && _priorityMap$get !== void 0 ? _priorityMap$get : 999;
-        var priorityB = (_priorityMap$get2 = priorityMap.get(b.strategyId)) !== null && _priorityMap$get2 !== void 0 ? _priorityMap$get2 : 999;
+        var _a$strategyConfig$act, _a$strategyConfig, _b$strategyConfig$act, _b$strategyConfig;
+        var priorityA = (_a$strategyConfig$act = (_a$strategyConfig = a.strategyConfig) === null || _a$strategyConfig === void 0 || (_a$strategyConfig = _a$strategyConfig.actions) === null || _a$strategyConfig === void 0 || (_a$strategyConfig = _a$strategyConfig[0]) === null || _a$strategyConfig === void 0 ? void 0 : _a$strategyConfig.priority) !== null && _a$strategyConfig$act !== void 0 ? _a$strategyConfig$act : 999;
+        var priorityB = (_b$strategyConfig$act = (_b$strategyConfig = b.strategyConfig) === null || _b$strategyConfig === void 0 || (_b$strategyConfig = _b$strategyConfig.actions) === null || _b$strategyConfig === void 0 || (_b$strategyConfig = _b$strategyConfig[0]) === null || _b$strategyConfig === void 0 ? void 0 : _b$strategyConfig.priority) !== null && _b$strategyConfig$act !== void 0 ? _b$strategyConfig$act : 999;
         return priorityA - priorityB;
       });
     }
@@ -720,11 +705,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 1. 展开所有商品为单件列表（排除已处理的数量）
       // 每个单件记录来自哪个原商品（通过 product.id）
       var unitProducts = [];
-      var _iterator10 = _createForOfIteratorHelper(groupProducts),
-        _step10;
+      var _iterator9 = _createForOfIteratorHelper(groupProducts),
+        _step9;
       try {
-        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-          var product = _step10.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var product = _step9.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -741,9 +726,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator10.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator10.f();
+        _iterator9.f();
       }
       if (unitProducts.length === 0) {
         return {
@@ -775,25 +760,25 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
       // 5. 按原商品 id 统计参与促销和不参与的数量
       var promotionQtyByProductId = new Map();
-      var _iterator11 = _createForOfIteratorHelper(inPromotionUnits),
-        _step11;
+      var _iterator10 = _createForOfIteratorHelper(inPromotionUnits),
+        _step10;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var _unit = _step11.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var _unit = _step10.value;
           var id = _unit.productId;
           promotionQtyByProductId.set(id, (promotionQtyByProductId.get(id) || 0) + 1);
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator11.f();
+        _iterator10.f();
       }
       var remainingQtyByProductId = new Map();
-      var _iterator12 = _createForOfIteratorHelper(notInPromotionUnits),
-        _step12;
+      var _iterator11 = _createForOfIteratorHelper(notInPromotionUnits),
+        _step11;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var _unit2 = _step12.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var _unit2 = _step11.value;
           var _id = _unit2.productId;
           remainingQtyByProductId.set(_id, (remainingQtyByProductId.get(_id) || 0) + 1);
         }
@@ -802,9 +787,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         // 按组内原价比例均摊
         // 记录每个原商品的均摊价格累加（用于后续聚合）
       } catch (err) {
-        _iterator12.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator12.f();
+        _iterator11.f();
       }
       var allocatedPricesByProductId = new Map();
       for (var g = 0; g < groupCount; g++) {
@@ -836,11 +821,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       }
 
       // 7. 为每个原商品生成结果
-      var _iterator13 = _createForOfIteratorHelper(groupProducts),
-        _step13;
+      var _iterator12 = _createForOfIteratorHelper(groupProducts),
+        _step12;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var _product = _step13.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var _product = _step12.value;
           var _key = this.getProductKey(_product);
           var _processedQty = processedQuantityMap.get(_key) || 0;
           var _availableQty = _product.quantity - _processedQty;
@@ -928,9 +913,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 8. 尾差调整：确保促销商品的 finalPrice × quantity 之和精确等于 groupPrice × groupCount
       } catch (err) {
-        _iterator13.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator13.f();
+        _iterator12.f();
       }
       if (groupCount > 0) {
         var expectedPromoTotal = new Decimal(groupPrice).mul(groupCount);
@@ -938,17 +923,17 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           return p.inPromotion;
         });
         var actualPromoTotal = new Decimal(0);
-        var _iterator14 = _createForOfIteratorHelper(promoItems),
-          _step14;
+        var _iterator13 = _createForOfIteratorHelper(promoItems),
+          _step13;
         try {
-          for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-            var _p = _step14.value;
+          for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+            var _p = _step13.value;
             actualPromoTotal = actualPromoTotal.plus(new Decimal(_p.finalPrice).mul(_p.quantity));
           }
         } catch (err) {
-          _iterator14.e(err);
+          _iterator13.e(err);
         } finally {
-          _iterator14.f();
+          _iterator13.f();
         }
         var roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
         if (!roundingDiff.eq(0)) {
@@ -979,17 +964,17 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
           // 重新计算 finalAmount
           finalAmount = new Decimal(0);
-          var _iterator15 = _createForOfIteratorHelper(result),
-            _step15;
+          var _iterator14 = _createForOfIteratorHelper(result),
+            _step14;
           try {
-            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-              var p = _step15.value;
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+              var p = _step14.value;
               finalAmount = finalAmount.plus(new Decimal(p.finalPrice).mul(p.quantity));
             }
           } catch (err) {
-            _iterator15.e(err);
+            _iterator14.e(err);
           } finally {
-            _iterator15.f();
+            _iterator14.f();
           }
         }
       }
@@ -1027,11 +1012,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 对于 bundle 子商品匹配，促销数量 = 主商品数量 × bundle子商品数量
       var totalPromoQty = 0;
       var productInfoMap = new Map();
-      var _iterator16 = _createForOfIteratorHelper(groupProducts),
-        _step16;
+      var _iterator15 = _createForOfIteratorHelper(groupProducts),
+        _step15;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var product = _step16.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var product = _step15.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1057,18 +1042,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 2. 判断是否满足促销条件
       } catch (err) {
-        _iterator16.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator16.f();
+        _iterator15.f();
       }
       var isFulfilled = totalPromoQty >= buyQuantity;
 
       // 3. 生成商品结果（第二次遍历）
-      var _iterator17 = _createForOfIteratorHelper(groupProducts),
-        _step17;
+      var _iterator16 = _createForOfIteratorHelper(groupProducts),
+        _step16;
       try {
-        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-          var _product2 = _step17.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var _product2 = _step16.value;
           var _key2 = this.getProductKey(_product2);
           var info = productInfoMap.get(_key2);
           if (!info || info.availableQty <= 0) continue;
@@ -1096,9 +1081,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 4. 计算赠品数量（使用促销数量）
       } catch (err) {
-        _iterator17.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator17.f();
+        _iterator16.f();
       }
       var giftCount = 0;
       if (isFulfilled) {
@@ -1173,11 +1158,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         return b.originalPrice.minus(a.originalPrice).toNumber();
       }).slice(0, rewardLimit);
       var selectedByProductId = new Map();
-      var _iterator18 = _createForOfIteratorHelper(selectedUnits),
-        _step18;
+      var _iterator17 = _createForOfIteratorHelper(selectedUnits),
+        _step17;
       try {
-        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var unit = _step18.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var unit = _step17.value;
           var existing = selectedByProductId.get(unit.product.id);
           if (existing) {
             existing.quantity += 1;
@@ -1190,18 +1175,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator18.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator18.f();
+        _iterator17.f();
       }
       var result = [];
       var originalAmount = new Decimal(0);
       var finalAmount = new Decimal(0);
-      var _iterator19 = _createForOfIteratorHelper(targetProducts),
-        _step19;
+      var _iterator18 = _createForOfIteratorHelper(targetProducts),
+        _step18;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var product = _step19.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var product = _step18.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1240,9 +1225,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           processedQuantityMap.set(key, processedQty + availableQty);
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator19.f();
+        _iterator18.f();
       }
       return {
         products: result,
@@ -1260,11 +1245,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getAvailablePromotionQuantity",
     value: function getAvailablePromotionQuantity(products, processedQuantityMap, matchedBundleIndexMap) {
       var total = 0;
-      var _iterator20 = _createForOfIteratorHelper(products),
-        _step20;
+      var _iterator19 = _createForOfIteratorHelper(products),
+        _step19;
       try {
-        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-          var product = _step20.value;
+        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+          var product = _step19.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1278,9 +1263,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator20.e(err);
+        _iterator19.e(err);
       } finally {
-        _iterator20.f();
+        _iterator19.f();
       }
       return total;
     }
@@ -1288,11 +1273,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "buildItemRewardTargetUnits",
     value: function buildItemRewardTargetUnits(products, processedQuantityMap, detail) {
       var units = [];
-      var _iterator21 = _createForOfIteratorHelper(products),
-        _step21;
+      var _iterator20 = _createForOfIteratorHelper(products),
+        _step20;
       try {
-        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
-          var product = _step21.value;
+        for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
+          var product = _step20.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -1311,9 +1296,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator21.e(err);
+        _iterator20.e(err);
       } finally {
-        _iterator21.f();
+        _iterator20.f();
       }
       return units;
     }
@@ -1369,11 +1354,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getRemainingProducts",
     value: function getRemainingProducts(allProducts, processedQuantityMap) {
       var result = [];
-      var _iterator22 = _createForOfIteratorHelper(allProducts),
-        _step22;
+      var _iterator21 = _createForOfIteratorHelper(allProducts),
+        _step21;
       try {
-        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var product = _step22.value;
+        for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
+          var product = _step21.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var remainingQty = product.quantity - processedQty;
@@ -1388,9 +1373,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator22.e(err);
+        _iterator21.e(err);
       } finally {
-        _iterator22.f();
+        _iterator21.f();
       }
       return result;
     }

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

@@ -227,10 +227,13 @@ class PromotionEvaluator {
     const productResults = this.evaluateProducts(input);
 
     // 2. 收集所有适用的促销（去重）
+    // strategyId is metadata and is not guaranteed to be unique. Use the actual
+    // configuration as the key so one strategy cannot overwrite another strategy's
+    // label/action when their IDs happen to be the same.
     const promotionMap = new Map();
     for (const productResult of productResults) {
       for (const promo of productResult.applicablePromotions) {
-        const existing = promotionMap.get(promo.strategyId);
+        const existing = promotionMap.get(promo.strategyConfig);
         const product = productResult.product;
 
         // 计算促销数量：如果是 bundle 子商品匹配，数量 = 主商品数量 × 子商品数量
@@ -253,7 +256,7 @@ class PromotionEvaluator {
           // 新促销
           const productMatchedBundleIndexMap = new Map();
           productMatchedBundleIndexMap.set(product.id, promo.matchedBundleIndex);
-          promotionMap.set(promo.strategyId, {
+          promotionMap.set(promo.strategyConfig, {
             ...promo,
             applicableProducts: [product],
             totalQuantity: promoQuantity,
@@ -305,7 +308,7 @@ class PromotionEvaluator {
     const cartResult = this.evaluateCart(input);
 
     // 2. 按 action priority 排序促销组（从 strategyConfig 获取 priority）
-    const sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups, cartResult.applicablePromotions);
+    const sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups);
 
     // 3. 追踪已处理的商品（避免重复处理）
     // key: `${product_id}_${product_variant_id}`
@@ -544,19 +547,11 @@ class PromotionEvaluator {
    * 按优先级排序促销组
    * 优先级从 strategyConfig.actions[0].priority 获取，数值越小优先级越高
    */
-  sortPromotionGroupsByPriority(groups, promotions) {
-    // 创建策略ID到优先级的映射
-    const priorityMap = new Map();
-    for (const promo of promotions) {
-      const actions = promo.strategyConfig?.actions || [];
-      const priority = actions[0]?.priority ?? 999;
-      priorityMap.set(promo.strategyId, priority);
-    }
-
+  sortPromotionGroupsByPriority(groups) {
     // 按优先级排序（数值越小优先级越高）
     return [...groups].sort((a, b) => {
-      const priorityA = priorityMap.get(a.strategyId) ?? 999;
-      const priorityB = priorityMap.get(b.strategyId) ?? 999;
+      const priorityA = a.strategyConfig?.actions?.[0]?.priority ?? 999;
+      const priorityB = b.strategyConfig?.actions?.[0]?.priority ?? 999;
       return priorityA - priorityB;
     });
   }

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/package.json

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