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

@@ -18,5 +18,7 @@ public class ApplicationConstant {
     
     public final static String BURYINGPOINT = "POINT";
 
-    public final static String DELIVERY_DISCOUNT_DESC="订单满%d元 【减%d配送费】 & 【免配送费】";
+    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元";
 }

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

@@ -72,7 +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.ApplicationConstant.*;
 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;
@@ -1000,23 +1000,31 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                         .findFirst();
 
                 if (discount.isPresent()) {
-                    String desc = DELIVERY_DISCOUNT_DESC;
+
+                    if(calculationDiscountResult.getDistributionFee()>0){
+                        String desc = DELIVERY_DISCOUNT_DESC1;
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, discount.get().getThresholdAmount() / 100
+                                , (calculationDiscountResult.getDeliveryAmount() - calculationDiscountResult.getDistributionFee()) / 100));
+                    }else{
+                        String desc = DELIVERY_DISCOUNT_DESC2;
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, discount.get().getThresholdAmount() / 100));
+                    }
                     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 {
+                    String desc = DELIVERY_DISCOUNT_DESC3;
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, calculationDiscountResult.getDeliveryAmount() / 100));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                     shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
-//                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
                 }
             } else {
+                String desc = DELIVERY_DISCOUNT_DESC3;
+                shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, calculationDiscountResult.getDeliveryAmount() / 100));
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
-//                shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
             }
         }else{