对接促销算价Alpha->fix

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java

@@ -246,17 +246,6 @@ public class AdditionSharingService {
             throw new ServiceException(ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST);
         }
 
-        //检查是否有加价购商品
-        CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity sendActivity = discountResult.getSendGoods()
-                .stream()
-                .filter(s -> ActivityTypeEnum.TYPE_81.getCode().equals(s.getActivityType()))
-                .collect(Collectors.toList()).get(0);
-
-        Map<String, CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsMap = sendActivity
-                .getSendGoods()
-                .stream()
-                .collect(Collectors.toMap(CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods::getGoodsId, Function.identity(), (k1, k2) -> k1));
-
         //添加商品行
         List<String> productIds = premiumExchangeActivity.getProducts().stream().map(p -> StringUtils.isEmpty(p.getSkuId()) ? p.getSpuId() : p.getSkuId()).collect(Collectors.toList());
         Map<String, GetProductsVo> getProductsVoMap = itemService.getProducts(productIds, shoppingCartInfoRequestVo.getPartnerId(), shoppingCartInfoRequestVo.getShopId(), BusinessTypeEnum.getByType(shoppingCartInfoRequestVo.getMenuType()).getCode());
@@ -276,7 +265,6 @@ public class AdditionSharingService {
             if (null == getProductsVo) {
                 continue;
             }
-            CalculationSharingDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods send = sendGoodsMap.get(goodsId);
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = this.getCartGoodsDetailDto(product, getProductsVo, goodsId, hgGood);
             shoppingCartGoodsDto.getProducts().add(cartGoodsDetailDto);
             //2.计算优惠价格
@@ -284,6 +272,7 @@ public class AdditionSharingService {
             totalDiscountAmount += cartGoodsDetailDto.getTotalDiscountAmount();
             currenttotalDiscountAmount += cartGoodsDetailDto.getTotalDiscountAmount();
             // 3.设置商品行优惠明细
+            CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount sendActivity = hgGood.getDiscounts().get(0);
             ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
             activityDiscountsDto.setActivityCode(sendActivity.getActivityCode());
             activityDiscountsDto.setActivityName(sendActivity.getActivityName());