调整浮点

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

@@ -18,7 +18,7 @@ public class ApplicationConstant {
     
     public final static String BURYINGPOINT = "POINT";
 
-    public final static String DELIVERY_DISCOUNT_DESC1="订单满%d元 减%d配送费";
-    public final static String DELIVERY_DISCOUNT_DESC2="订单满%d元 免配送费";
+    public final static String DELIVERY_DISCOUNT_DESC1="订单满%s元 减%s配送费";
+    public final static String DELIVERY_DISCOUNT_DESC2="订单满%s元 免配送费";
     public final static String DELIVERY_DISCOUNT_DESC3="另需配送费%s元";
 }

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

@@ -1006,7 +1006,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          */
 
         if(BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
-
+            DecimalFormat df = new DecimalFormat("###.##");
             List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
             activityTypeEnums.add(ActivityTypeEnum.TYPE_14);
 
@@ -1032,10 +1032,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if(discount!=null){
                 if(beanDto.getBenefitType() == 1){
                     String desc = DELIVERY_DISCOUNT_DESC2;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ));
                 }else{
                     String desc = DELIVERY_DISCOUNT_DESC1;
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,beanDto.getDiscountAmount() / 100));
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ,df.format(beanDto.getDiscountAmount().doubleValue() / 100)));
                 }
                 shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDistributionFee());
@@ -1047,10 +1047,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
                     if(beanDto.getBenefitType() == 1){
                         String desc = DELIVERY_DISCOUNT_DESC2;
-                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ));
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ));
                     }else{
                         String desc = DELIVERY_DISCOUNT_DESC1;
-                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount() /100 ,beanDto.getDiscountAmount() / 100));
+                        shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100 ),df.format(beanDto.getDiscountAmount().doubleValue() / 100)));
                     }
 
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
@@ -1058,7 +1058,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
 
                 }else{
-                    DecimalFormat df = new DecimalFormat("###.##");
                     String desc = DELIVERY_DISCOUNT_DESC3;
                     shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(deliveryAmount.doubleValue() / 100)));
                     shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);