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

@@ -70,6 +70,7 @@ import org.springframework.stereotype.Service;
 
 import java.awt.geom.Point2D;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1057,8 +1058,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
 
                 }else{
+                    DecimalFormat df = new DecimalFormat("#.00");
                     String desc = DELIVERY_DISCOUNT_DESC3;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, deliveryAmount.doubleValue() / 100));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(deliveryAmount.doubleValue() / 100)));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
                     shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);