促销数据适配

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -256,6 +256,10 @@ public class ActivityCalculationDiscountResponseDto {
              */
             private String goodsId;
             /**
+             * 0 原购物车商品 1 赠送商品  2 换购商品
+             */
+            private Integer cartGoodType;
+            /**
              * 商品数量
              */
             private Integer goodsQuantity;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -182,7 +182,35 @@ public class CalculationServiceImpl {
         if (activityCalculationDiscountResponseDto == null || !StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
             throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
         }
-        return activityCalculationDiscountResponseDto.getResult();
+
+        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult = activityCalculationDiscountResponseDto.getResult();
+        if(null != calculationDiscountResult) {
+            if(CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+                calculationDiscountResult.getDiscounts().removeIf(o -> o.getType() == 230);
+            }
+            if(CollectionUtils.isNotEmpty(calculationDiscountResult.getGoods())) {
+                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goods = new ArrayList<>();
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity sendActivity = new ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity();
+                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList2 = new ArrayList<>();
+                sendActivity.setSendGoods(sendGoodsList2);
+                calculationDiscountResult.getGoods().stream().forEach(o -> {
+                    if(o.getCartGoodType() == 1) {
+                        ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = new ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods();
+                        sendGoods.setGoodsId(o.getGoodsId());
+                        sendGoods.setNowPrice(o.getNowPrice());
+                        sendGoods.setOriginalPrice(o.getOriginalPrice());
+                        sendGoods.setSendNumber(o.getGoodsQuantity());
+                        sendGoods.setOriginalGoodsUid(o.getOriginalGoodsUid());
+                        sendGoodsList2.add(sendGoods);
+                    } else {
+                        goods.add(o);
+                    }
+                });
+                calculationDiscountResult.setGoods(goods);
+                calculationDiscountResult.setSendGoods(Arrays.asList(sendActivity));
+            }
+        }
+        return calculationDiscountResult;
     }