Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -136,6 +136,7 @@ public class OrderAdapter {
         long discountDeliveryAmount = 0;
         if (deliveryInfoDto != null) {
             deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
             if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                 discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();
 
@@ -605,7 +606,7 @@ public class OrderAdapter {
         long discountDeliveryAmount = 0;
         if (userDeliveryInfoDto != null) {
             deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
-
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
             if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                 discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();
 

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

@@ -1000,6 +1000,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
                 shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
+            }else{
+                shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
+                shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
+//                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
+                shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
             }
         }