Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

@@ -90,8 +90,10 @@ public class CouponPromotionService implements IPromotionService {
 
         // 当couponCode不为空时，需计算优惠价格
         long couponDiscount = 0;
-        if (couponPromotionVO != null && StringUtils.isNotEmpty(couponPromotionVO.getCouponCode())
-                && calculationDiscountResult != null) {
+
+        if (couponPromotionVO != null
+                && (StringUtils.isNotEmpty(couponPromotionVO.getCouponCode()) || CollectionUtils.isNotEmpty(couponPromotionVO.getCouponCodes()))
+                && calculationDiscountResult !=null) {
             List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
             if (CollectionUtils.isNotEmpty(couponResultsList)) {
                 for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {

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

@@ -1783,7 +1783,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         /**
          * 满额减配送费
          */
-
         if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
             DecimalFormat df = new DecimalFormat("###.##");
             List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
@@ -1833,21 +1832,22 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     }
 
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
-//                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);  原有逻辑
+                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
                     // 增加配送券之后的逻辑
-                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult==null?deliveryAmount:calculationDiscountResult.getDistributionFee());
+//                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult==null?deliveryAmount:calculationDiscountResult.getDistributionFee());
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
 
                 } else {
                     String desc = DELIVERY_DISCOUNT_DESC3;
                     shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(deliveryAmount.doubleValue() / 100)));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
-//                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);  原有逻辑
+                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
                     // 增加配送券之后的逻辑
-                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult==null?deliveryAmount:calculationDiscountResult.getDistributionFee());
+//                    shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult==null?deliveryAmount:calculationDiscountResult.getDistributionFee());
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
                 }
             }
+            LogUtil.info("fisherman 满额减配送算价格",discount,shoppingCartGoodsResponseVo);
         }
 
         /**