@pisell/pisellos 2.2.76 → 2.2.77

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

@@ -908,11 +908,74 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           // 更新已处理数量
           processedQuantityMap.set(_key, _processedQty + _availableQty);
         }
+
+        // 8. 尾差调整：确保促销商品的 finalPrice × quantity 之和精确等于 groupPrice × groupCount
       } catch (err) {
         _iterator13.e(err);
       } finally {
         _iterator13.f();
       }
+      if (groupCount > 0) {
+        var expectedPromoTotal = new Decimal(groupPrice).mul(groupCount);
+        var promoItems = result.filter(function (p) {
+          return p.inPromotion;
+        });
+        var actualPromoTotal = new Decimal(0);
+        var _iterator14 = _createForOfIteratorHelper(promoItems),
+          _step14;
+        try {
+          for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+            var _p = _step14.value;
+            actualPromoTotal = actualPromoTotal.plus(new Decimal(_p.finalPrice).mul(_p.quantity));
+          }
+        } catch (err) {
+          _iterator14.e(err);
+        } finally {
+          _iterator14.f();
+        }
+        var roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
+        if (!roundingDiff.eq(0)) {
+          // 优先找 quantity=1 的促销商品调整（差额直接加减到单价上）
+          var adjustTarget = promoItems.find(function (p) {
+            return p.quantity === 1;
+          });
+          if (adjustTarget) {
+            adjustTarget.finalPrice = this.formatPrice(new Decimal(adjustTarget.finalPrice).minus(roundingDiff));
+          } else if (promoItems.length > 0) {
+            // 没有 quantity=1 的促销商品，从最后一个促销商品中拆出1件做尾差调整
+            var lastPromo = promoItems[promoItems.length - 1];
+            var adjustedUnitPrice = this.formatPrice(new Decimal(lastPromo.finalPrice).minus(roundingDiff));
+
+            // 原商品减少1件
+            lastPromo.quantity -= 1;
+            lastPromo.isSplit = true;
+
+            // 拆出1件用调整后的价格
+            result.push(_objectSpread(_objectSpread({}, lastPromo), {}, {
+              id: this.generateRandomId(),
+              originalId: lastPromo.originalId || lastPromo.id,
+              quantity: 1,
+              finalPrice: adjustedUnitPrice,
+              isSplit: true
+            }));
+          }
+
+          // 重新计算 finalAmount
+          finalAmount = new Decimal(0);
+          var _iterator15 = _createForOfIteratorHelper(result),
+            _step15;
+          try {
+            for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+              var p = _step15.value;
+              finalAmount = finalAmount.plus(new Decimal(p.finalPrice).mul(p.quantity));
+            }
+          } catch (err) {
+            _iterator15.e(err);
+          } finally {
+            _iterator15.f();
+          }
+        }
+      }
       return {
         products: result,
         originalAmount: originalAmount.toNumber(),
@@ -947,11 +1010,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
       // 对于 bundle 子商品匹配，促销数量 = 主商品数量 × bundle子商品数量
       var totalPromoQty = 0;
       var productInfoMap = new Map();
-      var _iterator14 = _createForOfIteratorHelper(groupProducts),
-        _step14;
+      var _iterator16 = _createForOfIteratorHelper(groupProducts),
+        _step16;
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var product = _step14.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var product = _step16.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var availableQty = product.quantity - processedQty;
@@ -977,18 +1040,18 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 2. 判断是否满足促销条件
       } catch (err) {
-        _iterator14.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator14.f();
+        _iterator16.f();
       }
       var isFulfilled = totalPromoQty >= buyQuantity;
 
       // 3. 生成商品结果（第二次遍历）
-      var _iterator15 = _createForOfIteratorHelper(groupProducts),
-        _step15;
+      var _iterator17 = _createForOfIteratorHelper(groupProducts),
+        _step17;
       try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var _product2 = _step15.value;
+        for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+          var _product2 = _step17.value;
           var _key2 = this.getProductKey(_product2);
           var info = productInfoMap.get(_key2);
           if (!info || info.availableQty <= 0) continue;
@@ -1016,9 +1079,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
 
         // 4. 计算赠品数量（使用促销数量）
       } catch (err) {
-        _iterator15.e(err);
+        _iterator17.e(err);
       } finally {
-        _iterator15.f();
+        _iterator17.f();
       }
       var giftCount = 0;
       if (isFulfilled) {
@@ -1047,11 +1110,11 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
     key: "getRemainingProducts",
     value: function getRemainingProducts(allProducts, processedQuantityMap) {
       var result = [];
-      var _iterator16 = _createForOfIteratorHelper(allProducts),
-        _step16;
+      var _iterator18 = _createForOfIteratorHelper(allProducts),
+        _step18;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var product = _step16.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var product = _step18.value;
           var key = this.getProductKey(product);
           var processedQty = processedQuantityMap.get(key) || 0;
           var remainingQty = product.quantity - processedQty;
@@ -1066,9 +1129,9 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator16.f();
+        _iterator18.f();
       }
       return result;
     }

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

@@ -645,6 +645,46 @@ var PromotionEvaluator = class {
       }
       processedQuantityMap.set(key, processedQty + availableQty);
     }
+    if (groupCount > 0) {
+      const expectedPromoTotal = new import_decimal.default(groupPrice).mul(groupCount);
+      const promoItems = result.filter((p) => p.inPromotion);
+      let actualPromoTotal = new import_decimal.default(0);
+      for (const p of promoItems) {
+        actualPromoTotal = actualPromoTotal.plus(
+          new import_decimal.default(p.finalPrice).mul(p.quantity)
+        );
+      }
+      const roundingDiff = actualPromoTotal.minus(expectedPromoTotal);
+      if (!roundingDiff.eq(0)) {
+        const adjustTarget = promoItems.find((p) => p.quantity === 1);
+        if (adjustTarget) {
+          adjustTarget.finalPrice = this.formatPrice(
+            new import_decimal.default(adjustTarget.finalPrice).minus(roundingDiff)
+          );
+        } else if (promoItems.length > 0) {
+          const lastPromo = promoItems[promoItems.length - 1];
+          const adjustedUnitPrice = this.formatPrice(
+            new import_decimal.default(lastPromo.finalPrice).minus(roundingDiff)
+          );
+          lastPromo.quantity -= 1;
+          lastPromo.isSplit = true;
+          result.push({
+            ...lastPromo,
+            id: this.generateRandomId(),
+            originalId: lastPromo.originalId || lastPromo.id,
+            quantity: 1,
+            finalPrice: adjustedUnitPrice,
+            isSplit: true
+          });
+        }
+        finalAmount = new import_decimal.default(0);
+        for (const p of result) {
+          finalAmount = finalAmount.plus(
+            new import_decimal.default(p.finalPrice).mul(p.quantity)
+          );
+        }
+      }
+    }
     return {
       products: result,
       originalAmount: originalAmount.toNumber(),

package/package.json

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