@pisell/pisellos 2.2.183 → 2.2.185

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -1,5 +1,4 @@
 var _excluded = ["_promotionTags"];
-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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
@@ -7,6 +6,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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; } }
@@ -230,7 +230,7 @@ export function mergeIdenticalPromotionCartLines(products) {
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _line$metadata, _ref2, _line$metadata$source, _line$metadata2, _ref3, _promotion$finalPrice, _line$metadata3, _line$product_variant;
+      var _line$metadata, _ref2, _line$metadata$source, _line$metadata2, _ref3, _promotion$finalPrice, _line$metadata3, _line$booking_uid, _line$metadata4, _line$product_variant;
       var line = _step.value;
       if (getGiftInfo(line)) {
         merged.push(line);
@@ -244,7 +244,8 @@ export function mergeIdenticalPromotionCartLines(products) {
       var fingerprint = buildProductLineFingerprint(line.product_option_item, line.product_bundle);
       var unitPrice = String((_ref2 = (_line$metadata$source = (_line$metadata2 = line.metadata) === null || _line$metadata2 === void 0 ? void 0 : _line$metadata2.source_product_price) !== null && _line$metadata$source !== void 0 ? _line$metadata$source : line.selling_price) !== null && _ref2 !== void 0 ? _ref2 : '');
       var promoUnitPrice = String((_ref3 = (_promotion$finalPrice = promotion.finalPrice) !== null && _promotion$finalPrice !== void 0 ? _promotion$finalPrice : (_line$metadata3 = line.metadata) === null || _line$metadata3 === void 0 ? void 0 : _line$metadata3.main_product_selling_price) !== null && _ref3 !== void 0 ? _ref3 : '');
-      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, promotion.strategyId, unitPrice, promoUnitPrice].join('#');
+      var bookingUid = (_line$booking_uid = line === null || line === void 0 ? void 0 : line.booking_uid) !== null && _line$booking_uid !== void 0 ? _line$booking_uid : line === null || line === void 0 || (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4.booking_uid;
+      var mergeKey = [line.product_id, (_line$product_variant = line.product_variant_id) !== null && _line$product_variant !== void 0 ? _line$product_variant : 0, fingerprint, bookingUid ? String(bookingUid) : '', promotion.strategyId, unitPrice, promoUnitPrice].join('#');
       var hitIndex = indexByKey.get(mergeKey);
       if (hitIndex === undefined) {
         indexByKey.set(mergeKey, merged.length);
@@ -277,9 +278,9 @@ function dedupePromotionProcessedLines(lines) {
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _line$metadata5;
+      var _line$metadata6;
       var line = _step2.value;
-      var promo = line === null || line === void 0 || (_line$metadata5 = line.metadata) === null || _line$metadata5 === void 0 ? void 0 : _line$metadata5._promotion;
+      var promo = line === null || line === void 0 || (_line$metadata6 = line.metadata) === null || _line$metadata6 === void 0 ? void 0 : _line$metadata6._promotion;
       var originalUid = String(line._originalProductUid || getOrderProductUid(line) || '');
       if (!(promo !== null && promo !== void 0 && promo.inPromotion) || !originalUid) {
         passthrough.push(line);
@@ -295,8 +296,8 @@ function dedupePromotionProcessedLines(lines) {
     _iterator2.f();
   }
   var promotionDelta = function promotionDelta(line) {
-    var _line$metadata4;
-    var promo = (_line$metadata4 = line.metadata) === null || _line$metadata4 === void 0 ? void 0 : _line$metadata4._promotion;
+    var _line$metadata5;
+    var promo = (_line$metadata5 = line.metadata) === null || _line$metadata5 === void 0 ? void 0 : _line$metadata5._promotion;
     var original = Number(promo === null || promo === void 0 ? void 0 : promo.originalPrice);
     var final = Number(promo === null || promo === void 0 ? void 0 : promo.finalPrice);
     if (!Number.isFinite(original) || !Number.isFinite(final)) return 0;
@@ -307,7 +308,7 @@ function dedupePromotionProcessedLines(lines) {
     _step3;
   try {
     var _loop = function _loop() {
-      var _winner$metadata, _winner$metadata2;
+      var _winner$metadata, _winner$metadata2, _winner$metadata3;
       var _step3$value = _slicedToArray(_step3.value, 2),
         originalUid = _step3$value[0],
         group = _step3$value[1];
@@ -322,33 +323,48 @@ function dedupePromotionProcessedLines(lines) {
         return promotionDelta(line) > 0;
       });
       var xItemsLines = (pricingLines.length ? pricingLines : group).filter(function (line) {
-        var _line$metadata6;
-        return getPromotionActionType((_line$metadata6 = line.metadata) === null || _line$metadata6 === void 0 ? void 0 : _line$metadata6._promotion) === X_ITEMS_FOR_Y_PRICE;
+        var _line$metadata7;
+        return getPromotionActionType((_line$metadata7 = line.metadata) === null || _line$metadata7 === void 0 ? void 0 : _line$metadata7._promotion) === X_ITEMS_FOR_Y_PRICE;
       });
       var pool = xItemsLines.length ? xItemsLines : pricingLines.length ? pricingLines : group;
       var winner = pool[0];
       var expectedUnit = resolveXItemsExpectedUnitPrice((_winner$metadata = winner.metadata) === null || _winner$metadata === void 0 ? void 0 : _winner$metadata._promotion, sourceCartNum);
       if (expectedUnit != null && pool.length > 1) {
         winner = pool.reduce(function (best, line) {
-          var _best$metadata, _line$metadata7;
+          var _best$metadata, _line$metadata8;
           var bestDiff = Math.abs(Number((_best$metadata = best.metadata) === null || _best$metadata === void 0 || (_best$metadata = _best$metadata._promotion) === null || _best$metadata === void 0 ? void 0 : _best$metadata.finalPrice) - expectedUnit);
-          var lineDiff = Math.abs(Number((_line$metadata7 = line.metadata) === null || _line$metadata7 === void 0 || (_line$metadata7 = _line$metadata7._promotion) === null || _line$metadata7 === void 0 ? void 0 : _line$metadata7.finalPrice) - expectedUnit);
+          var lineDiff = Math.abs(Number((_line$metadata8 = line.metadata) === null || _line$metadata8 === void 0 || (_line$metadata8 = _line$metadata8._promotion) === null || _line$metadata8 === void 0 ? void 0 : _line$metadata8.finalPrice) - expectedUnit);
           return lineDiff < bestDiff ? line : best;
         }, pool[0]);
       } else if (pool.length > 1 && !expectedUnit) {
         winner = pool.reduce(function (best, line) {
-          var _best$metadata2, _line$metadata8, _line$metadata9;
+          var _best$metadata2, _line$metadata9, _line$metadata10;
           var bestFinal = Number((_best$metadata2 = best.metadata) === null || _best$metadata2 === void 0 || (_best$metadata2 = _best$metadata2._promotion) === null || _best$metadata2 === void 0 ? void 0 : _best$metadata2.finalPrice);
-          var lineFinal = Number((_line$metadata8 = line.metadata) === null || _line$metadata8 === void 0 || (_line$metadata8 = _line$metadata8._promotion) === null || _line$metadata8 === void 0 ? void 0 : _line$metadata8.finalPrice);
-          var original = Number((_line$metadata9 = line.metadata) === null || _line$metadata9 === void 0 || (_line$metadata9 = _line$metadata9._promotion) === null || _line$metadata9 === void 0 ? void 0 : _line$metadata9.originalPrice);
+          var lineFinal = Number((_line$metadata9 = line.metadata) === null || _line$metadata9 === void 0 || (_line$metadata9 = _line$metadata9._promotion) === null || _line$metadata9 === void 0 ? void 0 : _line$metadata9.finalPrice);
+          var original = Number((_line$metadata10 = line.metadata) === null || _line$metadata10 === void 0 || (_line$metadata10 = _line$metadata10._promotion) === null || _line$metadata10 === void 0 ? void 0 : _line$metadata10.originalPrice);
           if (Number.isFinite(original) && lineFinal >= original && bestFinal >= original) {
             return lineFinal < bestFinal ? line : best;
           }
           return promotionDelta(line) > promotionDelta(best) ? line : best;
         }, pool[0]);
       }
-      winner.num = getSafeProductNum(sourceCartNum || winner.num || 1);
-      var recomputeUnit = resolveXItemsExpectedUnitPrice((_winner$metadata2 = winner.metadata) === null || _winner$metadata2 === void 0 ? void 0 : _winner$metadata2._promotion, sourceCartNum);
+
+      // X件Y元：评估器会按单件均摊产出多条 inPromotion 行（如 $1 + $9），
+      // dedupe 应合并为「同组 X件Y元 行 num 之和」，不能用 sourceCartNum（整单 3 件）。
+      var winnerIsXItems = getPromotionActionType((_winner$metadata2 = winner.metadata) === null || _winner$metadata2 === void 0 ? void 0 : _winner$metadata2._promotion) === X_ITEMS_FOR_Y_PRICE;
+      if (winnerIsXItems) {
+        var xItemsGroupLines = group.filter(function (line) {
+          var _line$metadata11;
+          return getPromotionActionType((_line$metadata11 = line.metadata) === null || _line$metadata11 === void 0 ? void 0 : _line$metadata11._promotion) === X_ITEMS_FOR_Y_PRICE;
+        });
+        var evaluatedPromoQty = xItemsGroupLines.reduce(function (sum, line) {
+          return sum + Number(line.num || 0);
+        }, 0);
+        winner.num = getSafeProductNum(evaluatedPromoQty || winner.num || 1);
+      } else {
+        winner.num = getSafeProductNum(sourceCartNum || winner.num || 1);
+      }
+      var recomputeUnit = resolveXItemsExpectedUnitPrice((_winner$metadata3 = winner.metadata) === null || _winner$metadata3 === void 0 ? void 0 : _winner$metadata3._promotion, sourceCartNum);
       if (recomputeUnit != null) {
         var _promo$strategyMetada;
         var _promo = winner.metadata._promotion;
@@ -363,10 +379,10 @@ function dedupePromotionProcessedLines(lines) {
         _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var _line$metadata10, _winner$metadata3;
+          var _line$metadata12, _winner$metadata4;
           var _line = _step4.value;
-          var giftInfo = (_line$metadata10 = _line.metadata) === null || _line$metadata10 === void 0 || (_line$metadata10 = _line$metadata10._promotion) === null || _line$metadata10 === void 0 ? void 0 : _line$metadata10.giftInfo;
-          if (giftInfo && (_winner$metadata3 = winner.metadata) !== null && _winner$metadata3 !== void 0 && _winner$metadata3._promotion && !winner.metadata._promotion.giftInfo) {
+          var giftInfo = (_line$metadata12 = _line.metadata) === null || _line$metadata12 === void 0 || (_line$metadata12 = _line$metadata12._promotion) === null || _line$metadata12 === void 0 ? void 0 : _line$metadata12.giftInfo;
+          if (giftInfo && (_winner$metadata4 = winner.metadata) !== null && _winner$metadata4 !== void 0 && _winner$metadata4._promotion && !winner.metadata._promotion.giftInfo) {
             winner.metadata._promotion.giftInfo = giftInfo;
           }
         }
@@ -413,6 +429,126 @@ function getProductBundleForEvaluator(product) {
   });
 }
 
+/**
+ * 促销评估前合并同 SKU 拆分行（含促销/原价行），避免加购后仅前 2 件享受优惠。
+ * 带 `booking_uid` 的预约行不参与合并（每次加车独立 booking + 商品行）。
+ *
+ * @example
+ * consolidateMainProductsForPromotion([
+ *   { item: promoLineNum2, originalListIndex: 0 },
+ *   { item: regularLineNum2, originalListIndex: 1 },
+ * ]);
+ * // => 单行 num=4，清除 _promotion 后重新评估
+ */
+export function buildConsolidateKeyForPromotion(item) {
+  var _item$booking_uid, _item$metadata, _item$product_variant2;
+  var fingerprint = buildProductLineFingerprint(item.product_option_item, item.product_bundle);
+  var bookingUid = (_item$booking_uid = item === null || item === void 0 ? void 0 : item.booking_uid) !== null && _item$booking_uid !== void 0 ? _item$booking_uid : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.booking_uid;
+  if (bookingUid !== undefined && bookingUid !== null && String(bookingUid) !== '') {
+    var _item$product_variant;
+    return [item.product_id, (_item$product_variant = item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0, fingerprint, String(bookingUid)].join('#');
+  }
+  return [item.product_id, (_item$product_variant2 = item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0, fingerprint].join('#');
+}
+function consolidateMainProductsForPromotion(entries) {
+  if (!Array.isArray(entries) || entries.length <= 1) {
+    return _toConsumableArray(entries || []);
+  }
+  var groups = new Map();
+  var _iterator5 = _createForOfIteratorHelper(entries),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var _step5$value = _step5.value,
+        item = _step5$value.item,
+        originalListIndex = _step5$value.originalListIndex;
+      var key = buildConsolidateKeyForPromotion(item);
+      var existing = groups.get(key);
+      if (!existing) {
+        var mergedItem = cloneDeep(item);
+        var metadata = mergedItem.metadata || {};
+        delete metadata._promotion;
+        mergedItem.metadata = metadata;
+        if (Array.isArray(mergedItem.product_bundle)) {
+          var _iterator6 = _createForOfIteratorHelper(mergedItem.product_bundle),
+            _step6;
+          try {
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var bundle = _step6.value;
+              if (bundle && _typeof(bundle) === 'object') delete bundle._promotion;
+            }
+          } catch (err) {
+            _iterator6.e(err);
+          } finally {
+            _iterator6.f();
+          }
+        }
+        groups.set(key, {
+          item: mergedItem,
+          originalListIndex: originalListIndex
+        });
+        continue;
+      }
+      existing.item.num = getSafeProductNum(Number(existing.item.num || 0) + Number(item.num || 0));
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+  return Array.from(groups.values());
+}
+
+/**
+ * X件Y元 整组凑满时按每组 x 件拆开展示（4 件 → 2 行各 2 件 $10）。
+ *
+ * @example
+ * splitXItemsPromoLinesByGroup(mergedLines, strategyActionMap);
+ */
+function splitXItemsPromoLinesByGroup(lines, strategyActionMap) {
+  var result = [];
+  var _iterator7 = _createForOfIteratorHelper(lines),
+    _step7;
+  try {
+    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+      var _line$metadata13, _actionMeta$actionDet;
+      var line = _step7.value;
+      var promo = line === null || line === void 0 || (_line$metadata13 = line.metadata) === null || _line$metadata13 === void 0 ? void 0 : _line$metadata13._promotion;
+      if (!(promo !== null && promo !== void 0 && promo.inPromotion) || !promo.strategyId) {
+        result.push(line);
+        continue;
+      }
+      if (getPromotionActionType(promo) !== X_ITEMS_FOR_Y_PRICE) {
+        result.push(line);
+        continue;
+      }
+      var actionMeta = strategyActionMap.get(promo.strategyId);
+      var detail = (_actionMeta$actionDet = actionMeta === null || actionMeta === void 0 ? void 0 : actionMeta.actionDetail) !== null && _actionMeta$actionDet !== void 0 ? _actionMeta$actionDet : promo.actionDetail;
+      var x = Number(detail === null || detail === void 0 ? void 0 : detail.x);
+      var num = Number(line.num || 0);
+      var isCumulative = (detail === null || detail === void 0 ? void 0 : detail.cumulative) !== false;
+      if (!isCumulative || !Number.isFinite(x) || x <= 0 || num <= x || num % x !== 0) {
+        result.push(line);
+        continue;
+      }
+      var groupCount = num / x;
+      for (var i = 0; i < groupCount; i++) {
+        var splitLine = cloneDeep(line);
+        splitLine.num = getSafeProductNum(x);
+        splitLine.metadata = _objectSpread(_objectSpread({}, splitLine.metadata || {}), {}, {
+          unique_identification_number: createUuidV4()
+        });
+        result.push(splitLine);
+      }
+    }
+  } catch (err) {
+    _iterator7.e(err);
+  } finally {
+    _iterator7.f();
+  }
+  return result;
+}
+
 /** 生成新 numeric id（仅用于评估器内部追踪） */
 function generateNumericId() {
   return Math.floor(Math.random() * 1000000000) + Date.now();
@@ -428,6 +564,7 @@ function convertToPromotionProduct(product, index) {
   var _product$product_id, _product$product_vari, _product$num;
   var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
   var numericId = generateNumericId();
+  var originalItem = product;
   return {
     id: numericId,
     product_id: Number((_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : 0) || 0,
@@ -436,7 +573,7 @@ function convertToPromotionProduct(product, index) {
     price: getOrderProductOriginalPriceForPromotion(product),
     quantity: Number((_product$num = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num !== void 0 ? _product$num : 1) || 1,
     bundle: getProductBundleForEvaluator(product),
-    _originalItem: product,
+    _originalItem: originalItem,
     _originalId: getOrderProductUid(product),
     _originalIndex: index
   };
@@ -458,12 +595,12 @@ function calculateGiftActions(gifts, existingGifts) {
 
   // 按 strategyId 分组现有赠品
   var existingByStrategy = new Map();
-  var _iterator5 = _createForOfIteratorHelper(existingGifts),
-    _step5;
+  var _iterator8 = _createForOfIteratorHelper(existingGifts),
+    _step8;
   try {
-    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
       var _getGiftInfo, _gift$num;
-      var gift = _step5.value;
+      var gift = _step8.value;
       var strategyId = (_getGiftInfo = getGiftInfo(gift)) === null || _getGiftInfo === void 0 ? void 0 : _getGiftInfo.strategyId;
       if (!strategyId) continue;
       var existing = existingByStrategy.get(strategyId);
@@ -479,17 +616,17 @@ function calculateGiftActions(gifts, existingGifts) {
       }
     }
   } catch (err) {
-    _iterator5.e(err);
+    _iterator8.e(err);
   } finally {
-    _iterator5.f();
+    _iterator8.f();
   }
   var processedStrategyIds = new Set();
-  var _iterator6 = _createForOfIteratorHelper(gifts),
-    _step6;
+  var _iterator9 = _createForOfIteratorHelper(gifts),
+    _step9;
   try {
-    for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
       var _existing$totalQuanti;
-      var giftInfo = _step6.value;
+      var giftInfo = _step9.value;
       var _strategyId = giftInfo.strategyId,
         strategyName = giftInfo.strategyName,
         giftCount = giftInfo.giftCount,
@@ -519,12 +656,12 @@ function calculateGiftActions(gifts, existingGifts) {
         var reduceItems = [];
         var removeIds = [];
         var reversed = _toConsumableArray((_existing === null || _existing === void 0 ? void 0 : _existing.items) || []).reverse();
-        var _iterator8 = _createForOfIteratorHelper(reversed),
-          _step8;
+        var _iterator11 = _createForOfIteratorHelper(reversed),
+          _step11;
         try {
-          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
             var _giftItem$num;
-            var giftItem = _step8.value;
+            var giftItem = _step11.value;
             if (remaining <= 0) break;
             var uid = getOrderProductUid(giftItem);
             var _qty = Number((_giftItem$num = giftItem === null || giftItem === void 0 ? void 0 : giftItem.num) !== null && _giftItem$num !== void 0 ? _giftItem$num : 1) || 1;
@@ -541,9 +678,9 @@ function calculateGiftActions(gifts, existingGifts) {
             }
           }
         } catch (err) {
-          _iterator8.e(err);
+          _iterator11.e(err);
         } finally {
-          _iterator8.f();
+          _iterator11.f();
         }
         if (reduceItems.length > 0) toReduce.push({
           strategyId: _strategyId,
@@ -555,35 +692,35 @@ function calculateGiftActions(gifts, existingGifts) {
 
     // 失效策略的赠品：全部 remove
   } catch (err) {
-    _iterator6.e(err);
+    _iterator9.e(err);
   } finally {
-    _iterator6.f();
+    _iterator9.f();
   }
-  var _iterator7 = _createForOfIteratorHelper(existingByStrategy),
-    _step7;
+  var _iterator10 = _createForOfIteratorHelper(existingByStrategy),
+    _step10;
   try {
-    for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _step7$value = _slicedToArray(_step7.value, 2),
-        _strategyId2 = _step7$value[0],
-        _existing2 = _step7$value[1];
+    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+      var _step10$value = _slicedToArray(_step10.value, 2),
+        _strategyId2 = _step10$value[0],
+        _existing2 = _step10$value[1];
       if (processedStrategyIds.has(_strategyId2)) continue;
-      var _iterator9 = _createForOfIteratorHelper(_existing2.items),
-        _step9;
+      var _iterator12 = _createForOfIteratorHelper(_existing2.items),
+        _step12;
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var _giftItem = _step9.value;
+        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+          var _giftItem = _step12.value;
           toRemove.push(getOrderProductUid(_giftItem));
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator12.e(err);
       } finally {
-        _iterator9.f();
+        _iterator12.f();
       }
     }
   } catch (err) {
-    _iterator7.e(err);
+    _iterator10.e(err);
   } finally {
-    _iterator7.f();
+    _iterator10.f();
   }
   return {
     toAdd: toAdd,
@@ -603,11 +740,11 @@ export function extractProductMatchIdentifiersFromStrategyConfig(strategyConfig)
   var _strategyConfig$condi;
   var rules = strategyConfig === null || strategyConfig === void 0 || (_strategyConfig$condi = strategyConfig.conditions) === null || _strategyConfig$condi === void 0 ? void 0 : _strategyConfig$condi.rules;
   if (!Array.isArray(rules)) return [];
-  var _iterator10 = _createForOfIteratorHelper(rules),
-    _step10;
+  var _iterator13 = _createForOfIteratorHelper(rules),
+    _step13;
   try {
-    for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-      var rule = _step10.value;
+    for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+      var rule = _step13.value;
       if ((rule === null || rule === void 0 ? void 0 : rule.field) === 'productIdAndVariantId' && ((rule === null || rule === void 0 ? void 0 : rule.operator) === 'product_match' || (rule === null || rule === void 0 ? void 0 : rule.operator) === 'object_in') && Array.isArray(rule === null || rule === void 0 ? void 0 : rule.value)) {
         return rule.value.map(function (item) {
           return {
@@ -620,9 +757,9 @@ export function extractProductMatchIdentifiersFromStrategyConfig(strategyConfig)
       }
     }
   } catch (err) {
-    _iterator10.e(err);
+    _iterator13.e(err);
   } finally {
-    _iterator10.f();
+    _iterator13.f();
   }
   return [];
 }
@@ -708,11 +845,11 @@ export function calculateUnfulfilledPromotions(processedProducts, applicableStra
     if (_ret === 0) continue;
   }
   var result = [];
-  var _iterator11 = _createForOfIteratorHelper(unfulfilledMap.values()),
-    _step11;
+  var _iterator14 = _createForOfIteratorHelper(unfulfilledMap.values()),
+    _step14;
   try {
-    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-      var data = _step11.value;
+    for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+      var data = _step14.value;
       var needQuantity = data.requiredQuantity - data.currentQuantity;
       if (needQuantity > 0) {
         result.push(_objectSpread(_objectSpread({}, data), {}, {
@@ -721,9 +858,9 @@ export function calculateUnfulfilledPromotions(processedProducts, applicableStra
       }
     }
   } catch (err) {
-    _iterator11.e(err);
+    _iterator14.e(err);
   } finally {
-    _iterator11.f();
+    _iterator14.f();
   }
   return result;
 }
@@ -745,11 +882,11 @@ export function appendPromotionTags(products, evaluator) {
 
   // 评估器期望的 product shape，最少字段集
   var evaluatorInput = products.map(function (item, index) {
-    var _ref14, _item$id, _item$product_variant, _item$price, _item$quantity;
+    var _ref14, _item$id, _item$product_variant3, _item$price, _item$quantity;
     return {
       id: index,
       product_id: Number((_ref14 = (_item$id = item === null || item === void 0 ? void 0 : item.id) !== null && _item$id !== void 0 ? _item$id : item === null || item === void 0 ? void 0 : item.product_id) !== null && _ref14 !== void 0 ? _ref14 : 0) || 0,
-      product_variant_id: Number((_item$product_variant = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant !== void 0 ? _item$product_variant : 0) || 0,
+      product_variant_id: Number((_item$product_variant3 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant3 !== void 0 ? _item$product_variant3 : 0) || 0,
       name: (item === null || item === void 0 ? void 0 : item.title) || (item === null || item === void 0 ? void 0 : item.name) || '',
       price: Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : 0) || 0,
       quantity: Number((_item$quantity = item === null || item === void 0 ? void 0 : item.quantity) !== null && _item$quantity !== void 0 ? _item$quantity : 1) || 1,
@@ -763,11 +900,11 @@ export function appendPromotionTags(products, evaluator) {
     var data = strategies[index];
     var tags = [];
     if (data !== null && data !== void 0 && data.hasApplicableStrategy) {
-      var _iterator12 = _createForOfIteratorHelper(data.applicableStrategies),
-        _step12;
+      var _iterator15 = _createForOfIteratorHelper(data.applicableStrategies),
+        _step15;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var strategy = _step12.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var strategy = _step15.value;
           if (strategy.display) {
             tags.push({
               text: strategy.display.text,
@@ -777,9 +914,9 @@ export function appendPromotionTags(products, evaluator) {
           }
         }
       } catch (err) {
-        _iterator12.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator12.f();
+        _iterator15.f();
       }
     }
     // 商品卡兼容两种位置：顶层 `_promotionTags` 与 `metadata._promotionTags`
@@ -855,7 +992,8 @@ export function processCartPromotion(list, evaluator, options) {
       });
     }
   }
-  var mainProducts = mainProductsWithIndex.map(function (x) {
+  var consolidatedMainProductsWithIndex = consolidateMainProductsForPromotion(mainProductsWithIndex);
+  var mainProducts = consolidatedMainProductsWithIndex.map(function (x) {
     return x.item;
   });
   var existingGifts = existingGiftsWithIndex.map(function (x) {
@@ -867,18 +1005,18 @@ export function processCartPromotion(list, evaluator, options) {
     });
     if (existingGifts.length > 0) {
       var toRemove = [];
-      var _iterator13 = _createForOfIteratorHelper(existingGifts),
-        _step13;
+      var _iterator16 = _createForOfIteratorHelper(existingGifts),
+        _step16;
       try {
-        for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-          var gift = _step13.value;
+        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+          var gift = _step16.value;
           var uid = getOrderProductUid(gift);
           if (uid) toRemove.push(uid);
         }
       } catch (err) {
-        _iterator13.e(err);
+        _iterator16.e(err);
       } finally {
-        _iterator13.f();
+        _iterator16.f();
       }
       return {
         products: editProducts,
@@ -900,23 +1038,23 @@ export function processCartPromotion(list, evaluator, options) {
   // 1. 转 PromotionProduct
   var promotionProducts = [];
   var originalItemMap = new Map();
-  var productsForStrategies = mainProductsWithIndex.map(function (_ref16, i) {
-    var _item$product_id, _item$product_variant2, _item$metadata, _item$num;
+  var productsForStrategies = consolidatedMainProductsWithIndex.map(function (_ref16, i) {
+    var _item$product_id, _item$product_variant4, _item$metadata2, _item$num;
     var item = _ref16.item;
     return {
       id: i,
       product_id: Number((_item$product_id = item === null || item === void 0 ? void 0 : item.product_id) !== null && _item$product_id !== void 0 ? _item$product_id : 0) || 0,
-      product_variant_id: Number((_item$product_variant2 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant2 !== void 0 ? _item$product_variant2 : 0) || 0,
-      name: (item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.product_name) || (item === null || item === void 0 ? void 0 : item.title) || '',
+      product_variant_id: Number((_item$product_variant4 = item === null || item === void 0 ? void 0 : item.product_variant_id) !== null && _item$product_variant4 !== void 0 ? _item$product_variant4 : 0) || 0,
+      name: (item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.product_name) || (item === null || item === void 0 ? void 0 : item.title) || '',
       price: getOrderProductBasePrice(item),
       quantity: Number((_item$num = item === null || item === void 0 ? void 0 : item.num) !== null && _item$num !== void 0 ? _item$num : 1) || 1,
       bundle: getProductBundleForEvaluator(item)
     };
   });
-  for (var _i = 0; _i < mainProductsWithIndex.length; _i++) {
-    var _mainProductsWithInde = mainProductsWithIndex[_i],
-      _item = _mainProductsWithInde.item,
-      originalListIndex = _mainProductsWithInde.originalListIndex;
+  for (var _i = 0; _i < consolidatedMainProductsWithIndex.length; _i++) {
+    var _consolidatedMainProd = consolidatedMainProductsWithIndex[_i],
+      _item = _consolidatedMainProd.item,
+      originalListIndex = _consolidatedMainProd.originalListIndex;
     var promotionProduct = convertToPromotionProduct(_item, originalListIndex);
     promotionProducts.push(promotionProduct);
     originalItemMap.set(promotionProduct.id, {
@@ -931,16 +1069,16 @@ export function processCartPromotion(list, evaluator, options) {
     channel: options === null || options === void 0 ? void 0 : options.channel
   });
   var strategyActionMap = new Map();
-  var _iterator14 = _createForOfIteratorHelper(applicableStrategiesResult || []),
-    _step14;
+  var _iterator17 = _createForOfIteratorHelper(applicableStrategiesResult || []),
+    _step17;
   try {
-    for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-      var row = _step14.value;
-      var _iterator19 = _createForOfIteratorHelper((row === null || row === void 0 ? void 0 : row.applicableStrategies) || []),
-        _step19;
+    for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+      var row = _step17.value;
+      var _iterator22 = _createForOfIteratorHelper((row === null || row === void 0 ? void 0 : row.applicableStrategies) || []),
+        _step22;
       try {
-        for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
-          var strategy = _step19.value;
+        for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
+          var strategy = _step22.value;
           if (!(strategy !== null && strategy !== void 0 && strategy.strategyId)) continue;
           strategyActionMap.set(strategy.strategyId, {
             actionType: strategy.actionType,
@@ -948,17 +1086,17 @@ export function processCartPromotion(list, evaluator, options) {
           });
         }
       } catch (err) {
-        _iterator19.e(err);
+        _iterator22.e(err);
       } finally {
-        _iterator19.f();
+        _iterator22.f();
       }
     }
 
     // 3. 评估器
   } catch (err) {
-    _iterator14.e(err);
+    _iterator17.e(err);
   } finally {
-    _iterator14.f();
+    _iterator17.f();
   }
   var result = evaluator.evaluateCartWithPricing({
     products: promotionProducts,
@@ -967,11 +1105,11 @@ export function processCartPromotion(list, evaluator, options) {
 
   // 4. 收集每个策略的 sourceProductIds（参与策略的主商品 uid）
   var strategySourceProductIds = new Map();
-  var _iterator15 = _createForOfIteratorHelper(result.products),
-    _step15;
+  var _iterator18 = _createForOfIteratorHelper(result.products),
+    _step18;
   try {
-    for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-      var priced = _step15.value;
+    for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+      var priced = _step18.value;
       if (priced.inPromotion && priced.strategyId) {
         var _priced$originalId;
         var sourceId = (_priced$originalId = priced.originalId) !== null && _priced$originalId !== void 0 ? _priced$originalId : priced.id;
@@ -988,9 +1126,9 @@ export function processCartPromotion(list, evaluator, options) {
 
     // 5. 扩展 gifts，加 sourceProductIds
   } catch (err) {
-    _iterator15.e(err);
+    _iterator18.e(err);
   } finally {
-    _iterator15.f();
+    _iterator18.f();
   }
   var extendedGifts = result.gifts.map(function (gift) {
     return _objectSpread(_objectSpread({}, gift), {}, {
@@ -1000,26 +1138,26 @@ export function processCartPromotion(list, evaluator, options) {
 
   // 6. PricedProduct → OrderProduct（含拆分与价格调整）
   var strategyGiftInfoMap = new Map();
-  var _iterator16 = _createForOfIteratorHelper(extendedGifts),
-    _step16;
+  var _iterator19 = _createForOfIteratorHelper(extendedGifts),
+    _step19;
   try {
-    for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-      var _gift = _step16.value;
+    for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+      var _gift = _step19.value;
       strategyGiftInfoMap.set(_gift.strategyId, _gift);
     }
   } catch (err) {
-    _iterator16.e(err);
+    _iterator19.e(err);
   } finally {
-    _iterator16.f();
+    _iterator19.f();
   }
   var strategyGiftInfoOwner = new Map();
   var processedProducts = [];
-  var _iterator17 = _createForOfIteratorHelper(result.products),
-    _step17;
+  var _iterator20 = _createForOfIteratorHelper(result.products),
+    _step20;
   try {
-    for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+    for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
       var _priced$originalId2, _priced$product_id, _originalItem$product, _metadata$_promotion2;
-      var _priced = _step17.value;
+      var _priced = _step20.value;
       var rawSourceId = (_priced$originalId2 = _priced.originalId) !== null && _priced$originalId2 !== void 0 ? _priced$originalId2 : _priced.id;
       var _sourceId = Number(rawSourceId);
       var _originalData = Number.isFinite(_sourceId) ? originalItemMap.get(_sourceId) : undefined;
@@ -1040,17 +1178,17 @@ export function processCartPromotion(list, evaluator, options) {
       var wasInPromotion = ((_metadata$_promotion2 = metadata._promotion) === null || _metadata$_promotion2 === void 0 ? void 0 : _metadata$_promotion2.inPromotion) === true;
       delete metadata._promotion;
       if (Array.isArray(newItem.product_bundle)) {
-        var _iterator20 = _createForOfIteratorHelper(newItem.product_bundle),
-          _step20;
+        var _iterator23 = _createForOfIteratorHelper(newItem.product_bundle),
+          _step23;
         try {
-          for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
-            var b = _step20.value;
+          for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
+            var b = _step23.value;
             if (b && _typeof(b) === 'object') delete b._promotion;
           }
         } catch (err) {
-          _iterator20.e(err);
+          _iterator23.e(err);
         } finally {
-          _iterator20.f();
+          _iterator23.f();
         }
       }
       var originalBasePrice = getOrderProductOriginalPriceForPromotion(originalItem);
@@ -1135,9 +1273,9 @@ export function processCartPromotion(list, evaluator, options) {
 
     // 7. 赠品/编辑商品原样拼回；同时同步赠品的 sourceProductIds / sourceProductId
   } catch (err) {
-    _iterator17.e(err);
+    _iterator20.e(err);
   } finally {
-    _iterator17.f();
+    _iterator20.f();
   }
   for (var _i2 = 0, _existingGiftsWithInd = existingGiftsWithIndex; _i2 < _existingGiftsWithInd.length; _i2++) {
     var _getGiftInfo3;
@@ -1182,6 +1320,8 @@ export function processCartPromotion(list, evaluator, options) {
   processedProducts.splice.apply(processedProducts, [0, processedProducts.length].concat(_toConsumableArray(dedupedPromotionLines)));
   var mergedPromotionLines = mergeIdenticalPromotionCartLines(processedProducts);
   processedProducts.splice.apply(processedProducts, [0, processedProducts.length].concat(_toConsumableArray(mergedPromotionLines)));
+  var splitPromoLines = splitXItemsPromoLinesByGroup(processedProducts, strategyActionMap);
+  processedProducts.splice.apply(processedProducts, [0, processedProducts.length].concat(_toConsumableArray(splitPromoLines)));
 
   // 9. 给「有适用策略但未参与促销」的主商品打 inPromotion:false
   var _loop3 = function _loop3() {
@@ -1219,12 +1359,12 @@ export function processCartPromotion(list, evaluator, options) {
   var giftActions = calculateGiftActions(extendedGifts, existingGifts);
 
   // 10.1 更新 lastEvaluatedGiftCount，便于下次评估时判别「策略已变」
-  var _iterator18 = _createForOfIteratorHelper(existingGifts),
-    _step18;
+  var _iterator21 = _createForOfIteratorHelper(existingGifts),
+    _step21;
   try {
-    for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+    for (_iterator21.s(); !(_step21 = _iterator21.n()).done;) {
       var _getGiftInfo4, _metadata;
-      var _gift3 = _step18.value;
+      var _gift3 = _step21.value;
       var _strategyId3 = (_getGiftInfo4 = getGiftInfo(_gift3)) === null || _getGiftInfo4 === void 0 ? void 0 : _getGiftInfo4.strategyId;
       if (!_strategyId3) continue;
       var _latest = strategyGiftInfoMap.get(_strategyId3);
@@ -1235,9 +1375,9 @@ export function processCartPromotion(list, evaluator, options) {
 
     // 11. 未满足促销
   } catch (err) {
-    _iterator18.e(err);
+    _iterator21.e(err);
   } finally {
-    _iterator18.f();
+    _iterator21.f();
   }
   var unfulfilledPromotions = calculateUnfulfilledPromotions(processedProducts, applicableStrategiesResult, mainProducts);
 
@@ -1247,6 +1387,7 @@ export function processCartPromotion(list, evaluator, options) {
     delete product._sortIndex;
     delete product._sortSubIndex;
     delete product._originalProductUid;
+    delete product._sourceCartNum;
   }
   return {
     products: processedProducts,