@pisell/pisellos 2.2.72 → 2.2.74

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

@@ -719,7 +719,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             unitProducts.push({
               product: product,
               price: product.price,
-              productId: product.id
+              productId: product.id,
+              sourceAvailableQty: availableQty
             });
           }
         }
@@ -736,8 +737,13 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
         };
       }
 
-      // 2. 按价格从高到低排序（优先使用高价商品）
+      // 2. 排序：优先选择来源数量是 x 倍数的商品（可完整凑组不拆分），然后按价格从高到低
       unitProducts.sort(function (a, b) {
+        // 优先级1：来源购物车项数量是 x 的倍数的排前面（这些商品可以完整凑组，避免拆分）
+        var aIsMultiple = a.sourceAvailableQty > 0 && a.sourceAvailableQty % x === 0 ? 1 : 0;
+        var bIsMultiple = b.sourceAvailableQty > 0 && b.sourceAvailableQty % x === 0 ? 1 : 0;
+        if (aIsMultiple !== bIsMultiple) return bIsMultiple - aIsMultiple;
+        // 优先级2：按价格从高到低（优先使用高价商品）
         return b.price - a.price;
       });
 
@@ -833,7 +839,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             var totalAllocated = allocatedPrices.reduce(function (sum, p) {
               return sum.plus(p);
             }, new Decimal(0));
-            var finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+            // 取促销价和原价的最小值，避免促销反而加价
+            var productOriginalAmount = new Decimal(_product.price).mul(promoQty);
+            var actualTotal = Decimal.min(totalAllocated, productOriginalAmount);
+            var finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
               quantity: promoQty,
               finalPrice: finalPricePerUnit,
@@ -843,9 +852,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
               isSplit: false,
               matchedBundleIndex: matchedBundleIndex
             }));
-            var productOriginalAmount = new Decimal(_product.price).mul(promoQty);
             originalAmount = originalAmount.plus(productOriginalAmount);
-            finalAmount = finalAmount.plus(totalAllocated);
+            finalAmount = finalAmount.plus(actualTotal);
           } else if (promoQty === 0 && remainingQty > 0) {
             // 全部不参与促销：保留原 id，finalPrice = 原价
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
@@ -865,7 +873,10 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
             var _totalAllocated = allocatedPrices.reduce(function (sum, p) {
               return sum.plus(p);
             }, new Decimal(0));
-            var _finalPricePerUnit = this.formatPrice(_totalAllocated.div(promoQty));
+            // 取促销价和原价的最小值，避免促销反而加价
+            var promoOriginalAmount = new Decimal(_product.price).mul(promoQty);
+            var _actualTotal = Decimal.min(_totalAllocated, promoOriginalAmount);
+            var _finalPricePerUnit = this.formatPrice(_actualTotal.div(promoQty));
             result.push(_objectSpread(_objectSpread({}, _product), {}, {
               id: this.generateRandomId(),
               originalId: _product.id,
@@ -877,9 +888,8 @@ export var PromotionEvaluator = /*#__PURE__*/function () {
               matchedBundleIndex: matchedBundleIndex,
               isSplit: true
             }));
-            var promoOriginalAmount = new Decimal(_product.price).mul(promoQty);
             originalAmount = originalAmount.plus(promoOriginalAmount);
-            finalAmount = finalAmount.plus(_totalAllocated);
+            finalAmount = finalAmount.plus(_actualTotal);
 
             // 不参与促销的部分：保留原 id
             result.push(_objectSpread(_objectSpread({}, _product), {}, {

package/dist/modules/Rules/index.js

@@ -1061,15 +1061,24 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref7, _product$_promotion$f, _product12;
+              var _ref7, _product$_promotion$f, _product12, _product$origin_total;
+              var total = product.inPromotion ? (_ref7 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref7 !== void 0 ? _ref7 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var main_product_selling_price = product.price;
+              if ((product.discount_list || []).some(function (item) {
+                return item.type === 'promotion';
+              })) {
+                var _product$total, _product$main_product;
+                total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
+                main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
+              }
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
                 price: product.price,
                 main_product_selling_price: product.price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
-                total: product.inPromotion ? (_ref7 = (_product$_promotion$f = (_product12 = product) === null || _product12 === void 0 || (_product12 = _product12._promotion) === null || _product12 === void 0 ? void 0 : _product12.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref7 !== void 0 ? _ref7 : product.total : product.origin_total || product.total,
+                total: total,
                 price: product.price,
-                main_product_selling_price: product.price
+                main_product_selling_price: main_product_selling_price
               }), {}, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
@@ -1110,11 +1119,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (flatItem.type === 'main') {
           // 主商品：保持原有逻辑
           if (splitCount < totalQuantity && isNeedSplit) {
+            var _product$origin_total2;
+            var _total = (_product$origin_total2 = product.origin_total) !== null && _product$origin_total2 !== void 0 ? _product$origin_total2 : product.total;
+            if ((product.discount_list || []).some(function (item) {
+              return item.type === 'promotion';
+            })) {
+              var _product$total2;
+              _total = (_product$total2 = product.total) !== null && _product$total2 !== void 0 ? _product$total2 : product.origin_total;
+            }
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion'),
               quantity: totalQuantity - splitCount,
               _id: product._id.split('___')[0],
-              total: product.origin_total || product.total
+              total: _total
             }));
           }
           for (var i = 0; i < splitCount; i++) {
@@ -1188,13 +1205,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             };
             appliedProducts.push(discountDetail);
             appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
-            var total = targetProductTotal;
+            var _total2 = targetProductTotal;
             if (product.options) {
-              total = product.options.reduce(function (accumulator, currentValue) {
+              _total2 = product.options.reduce(function (accumulator, currentValue) {
                 var currentPrice = new Decimal(currentValue.price || 0);
                 var currentNum = new Decimal(currentValue.num || 0);
                 return accumulator.add(currentPrice.mul(currentNum));
-              }, new Decimal(total)).toNumber();
+              }, new Decimal(_total2)).toNumber();
             }
 
             // 记录应用了优惠券的商品
@@ -1213,7 +1230,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 }),
                 variant: originProduct._productInit.variant,
                 original_price: new Decimal(product.price || 0).toNumber(),
-                total: total
+                total: _total2
               }));
             } else {
               arr.push(_this3.hooks.setProduct(originProduct, {
@@ -1221,7 +1238,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 _id: product._id.split('___')[0] + '___' + _selectedDiscount.id + index,
                 price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
                 quantity: isNeedSplit ? 1 : product.quantity,
-                total: total,
+                total: _total2,
                 origin_total: productOriginTotal,
                 main_product_selling_price: targetProductTotal
               }));

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

@@ -512,14 +512,21 @@ var PromotionEvaluator = class {
         unitProducts.push({
           product,
           price: product.price,
-          productId: product.id
+          productId: product.id,
+          sourceAvailableQty: availableQty
         });
       }
     }
     if (unitProducts.length === 0) {
       return { products: [], originalAmount: 0, finalAmount: 0 };
     }
-    unitProducts.sort((a, b) => b.price - a.price);
+    unitProducts.sort((a, b) => {
+      const aIsMultiple = a.sourceAvailableQty > 0 && a.sourceAvailableQty % x === 0 ? 1 : 0;
+      const bIsMultiple = b.sourceAvailableQty > 0 && b.sourceAvailableQty % x === 0 ? 1 : 0;
+      if (aIsMultiple !== bIsMultiple)
+        return bIsMultiple - aIsMultiple;
+      return b.price - a.price;
+    });
     const totalUnits = unitProducts.length;
     const groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
     const promotionUnits = groupCount * x;
@@ -573,7 +580,9 @@ var PromotionEvaluator = class {
           (sum, p) => sum.plus(p),
           new import_decimal.default(0)
         );
-        const finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+        const productOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
+        const actualTotal = import_decimal.default.min(totalAllocated, productOriginalAmount);
+        const finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
         result.push({
           ...product,
           quantity: promoQty,
@@ -584,9 +593,8 @@ var PromotionEvaluator = class {
           isSplit: false,
           matchedBundleIndex
         });
-        const productOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
         originalAmount = originalAmount.plus(productOriginalAmount);
-        finalAmount = finalAmount.plus(totalAllocated);
+        finalAmount = finalAmount.plus(actualTotal);
       } else if (promoQty === 0 && remainingQty > 0) {
         result.push({
           ...product,
@@ -605,7 +613,9 @@ var PromotionEvaluator = class {
           (sum, p) => sum.plus(p),
           new import_decimal.default(0)
         );
-        const finalPricePerUnit = this.formatPrice(totalAllocated.div(promoQty));
+        const promoOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
+        const actualTotal = import_decimal.default.min(totalAllocated, promoOriginalAmount);
+        const finalPricePerUnit = this.formatPrice(actualTotal.div(promoQty));
         result.push({
           ...product,
           id: this.generateRandomId(),
@@ -618,9 +628,8 @@ var PromotionEvaluator = class {
           matchedBundleIndex,
           isSplit: true
         });
-        const promoOriginalAmount = new import_decimal.default(product.price).mul(promoQty);
         originalAmount = originalAmount.plus(promoOriginalAmount);
-        finalAmount = finalAmount.plus(totalAllocated);
+        finalAmount = finalAmount.plus(actualTotal);
         result.push({
           ...product,
           quantity: remainingQty,

package/lib/modules/Rules/index.js

@@ -810,6 +810,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               })
             ]);
           } else {
+            let total = product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
+            let main_product_selling_price = product.price;
+            if ((product.discount_list || []).some((item) => item.type === "promotion")) {
+              total = product.total ?? product.origin_total;
+              main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
+            }
             processedProductsMap.set(product._id, [
               this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
@@ -817,9 +823,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   main_product_selling_price: product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
-                  total: product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total || product.total,
+                  total,
                   price: product.price,
-                  main_product_selling_price: product.price
+                  main_product_selling_price
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })
@@ -854,12 +860,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       const arr = [];
       if (flatItem.type === "main") {
         if (splitCount < totalQuantity && isNeedSplit) {
+          let total = product.origin_total ?? product.total;
+          if ((product.discount_list || []).some((item) => item.type === "promotion")) {
+            total = product.total ?? product.origin_total;
+          }
           arr.push(
             this.hooks.setProduct(originProduct, {
               discount_list: this.filterDiscountListByType(product.discount_list, "promotion"),
               quantity: totalQuantity - splitCount,
               _id: product._id.split("___")[0],
-              total: product.origin_total || product.total
+              total
             })
           );
         }

package/package.json

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