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

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

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

@@ -1028,11 +1028,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if(discount!=null){
                 if(calculationDiscountResult.getDistributionFee()>0){
                     String desc = DELIVERY_DISCOUNT_DESC1;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, discount.getThresholdAmount().doubleValue() / 100
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, discount.getThresholdAmount() / 100
                             , (calculationDiscountResult.getDeliveryAmount().doubleValue() - calculationDiscountResult.getDistributionFee().doubleValue()) / 100));
                 }else{
                     String desc = DELIVERY_DISCOUNT_DESC2;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, discount.getThresholdAmount().doubleValue() / 100));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, discount.getThresholdAmount() / 100));
                 }
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
@@ -1046,10 +1046,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
                     if(beanDto.getBenefitType() == 1||beanDto.getDiscountAmount()>=deliveryAmount){
                         String desc = DELIVERY_DISCOUNT_DESC2;
-                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount().doubleValue() /100 ));
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
                     }else{
                         String desc = DELIVERY_DISCOUNT_DESC1;
-                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount().doubleValue() /100 ,beanDto.getDiscountAmount().doubleValue() / 100));
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,beanDto.getDiscountAmount() / 100));
                     }
 
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
@@ -1058,7 +1058,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
                 }else{
                     String desc = DELIVERY_DISCOUNT_DESC3;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, deliveryAmount.doubleValue() / 100));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, deliveryAmount / 100));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
                     shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);