对接促销算价Alpha->fix

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

@@ -67,16 +67,15 @@ public class CouponSharingService {
             shoppingCartGoodsResponseVo.setAvailableCoupon(activityClassifyCouponBean);
         }
 
-        // 当couponCode不为空时，需计算优惠价格
+        // 当couponCode不为空时，需计算优惠价格 3代金 31折扣  32商品  33换购券
         long couponDiscount = 0;
         if (couponPromotionVO != null && StringUtils.isNotEmpty(couponPromotionVO.getCouponCode())
-                && calculationDiscountResult != null) {
-            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
-            if (CollectionUtils.isNotEmpty(couponResultsList)) {
-                for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
-                    couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
-                }
-            }
+                && calculationDiscountResult != null && CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+            //List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
+            List<Integer> asList = Arrays.asList(3, 31);
+            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> couponResultsList = calculationDiscountResult.getDiscounts();
+            Optional<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> first = couponResultsList.stream().filter(d -> asList.contains(d.getType())).findFirst();
+            couponDiscount = first.get().getDiscount().longValue();
         }
         shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
         //循环购物车商品券
@@ -98,7 +97,6 @@ public class CouponSharingService {
                 }
             }
         }
-
     }