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

shopping-cart-application-service/src/main/java/cn/freemud/constant/ApplicationConstant.java

@@ -17,4 +17,6 @@ public class ApplicationConstant {
     public final static String CURRENT_VERSION = "1.5.2";
     
     public final static String BURYINGPOINT = "POINT";
+
+    public final static String DELIVERY_DISCOUNT_DESC="订单满%d元 【减%d配送费】 & 【免配送费】";
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -114,6 +114,11 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 满额减配送费描述
+     */
+    private String deliveryDiscountDesc;
+
 
 
 

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

@@ -72,6 +72,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static cn.freemud.constant.ApplicationConstant.DELIVERY_DISCOUNT_DESC;
 import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST;
 import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS;
 import static java.util.stream.Collectors.toList;
@@ -996,9 +997,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     .findFirst();
 
             if (discount.isPresent()) {
+                String desc=DELIVERY_DISCOUNT_DESC;
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
                 shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
+                shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc,discount.get().getThresholdAmount()/100
+                        ,(calculationDiscountResult.getDeliveryAmount()-calculationDiscountResult.getDistributionFee())/100));
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
             }else{
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());