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

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

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

@@ -99,7 +99,8 @@ public class CouponPromotionService implements IPromotionService {
                     couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
                 }
             }
-            if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())) {
+            if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())
+                    && CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getCouponCodes())) {
                 //选中优惠券赋值
                 List<ChooseCouponVo> couponCodes = new ArrayList<>();
                 for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){

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

@@ -94,6 +94,7 @@ public class CouponSharingService {
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> couponResultsList = calculationDiscountResult.getDiscounts();
             couponDiscount = couponResultsList.stream().filter(d -> asList.contains(d.getType())).mapToLong(d -> d.getDiscount().longValue()).sum();
             //选中优惠券赋值
+            if(CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getCouponCodes())){
                 List<ChooseCouponVo> couponCodes = new ArrayList<>();
                 for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
                     for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : couponResultsList){
@@ -105,6 +106,7 @@ public class CouponSharingService {
                 }
                 shoppingCartGoodsResponseVo.setCouponCodes(couponCodes);
             }
+        }
         shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
 
         Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getValidCouponMap();