Merge remote-tracking branch 'remotes/origin/feature/1.9.30_买一赠一&第X件Y折' into develop

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java

@@ -84,7 +84,7 @@ public class BuySendPromotionService implements IPromotionService {
         Map<String, Integer> maxNums = new HashMap<>();
         for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity activityList : sendActivityLists) {
             for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGood : activityList.getSendGoods()) {
-                sendGoodsMap.put(sendGood.getCategory(), sendGood);
+                sendGoodsMap.put(sendGood.getGoodsId(), sendGood);
                 maxNums.put(sendGood.getGoodsId(), activityList.getMaxNum());
                 activitySpuIds.add(sendGood.getGoodsId());
             }
@@ -249,12 +249,12 @@ public class BuySendPromotionService implements IPromotionService {
      */
     private void putNewCartGoodsList(Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsMap, CartGoods
             cartGood, List<CartGoods> newCartGoodsList, boolean manyOrSingle) {
-        if (sendGoodsMap.get(cartGood.getSpuId()) == null) {
+        if (sendGoodsMap.get(cartGood.getGoodsId()) == null) {
             return;
         }
         if (manyOrSingle) {
             // 多规格
-            if (!Objects.equals(sendGoodsMap.get(cartGood.getSpuId()).getGoodsId(), cartGood.getSkuId())) {
+            if (!Objects.equals(sendGoodsMap.get(cartGood.getSkuId()).getGoodsId(), cartGood.getSkuId())) {
                 return;
             }
         } else {
@@ -264,7 +264,7 @@ public class BuySendPromotionService implements IPromotionService {
                 return;
             }
         }
-        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getSpuId());
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getGoodsId());
         CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
         cartGoods.setClassificationId(cartGood.getClassificationId());
         cartGoods.setClassificationName(cartGood.getClassificationName());