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/constant/ApplicationConstant.java

@@ -20,5 +20,5 @@ public class ApplicationConstant {
 
     public final static String DELIVERY_DISCOUNT_DESC1="订单满%d元 减%d配送费";
     public final static String DELIVERY_DISCOUNT_DESC2="订单满%d元 免配送费";
-    public final static String DELIVERY_DISCOUNT_DESC3="另需配送费%d元";
+    public final static String DELIVERY_DISCOUNT_DESC3="另需配送费%f元";
 }

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

@@ -1058,7 +1058,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
                 }else{
                     String desc = DELIVERY_DISCOUNT_DESC3;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, deliveryAmount / 100));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, deliveryAmount.doubleValue() / 100));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
                     shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);