Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'qa' of…

Merge branches 'feature/20210715_购物车可用优惠券改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -100,12 +100,12 @@ public class CouponPromotionService implements IPromotionService {
                     couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
                 }
             }
-            if (CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+            if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())) {
                 //选中优惠券赋值
                 List<ChooseCouponVo> couponCodes = new ArrayList<>();
                 for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
-                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()){
-                        if(chooseCouponVo.getCouponCode().equals(discount.getActivityCode())){
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults discount : calculationDiscountResult.getCouponDiscounts()){
+                        if(chooseCouponVo.getCouponCode().equals(discount.getCouponCode())){
                             couponCodes.add(chooseCouponVo);
                             break;
                         }