Merge remote-tracking branch 'origin/dev'

src/main/java/com/uas/platform/b2b/openapi/model/CustTrading.java

@@ -9,9 +9,9 @@ public class CustTrading {
     private Long custUU;
     private String custName;
     private Double realAccept;
-    private String acceptPercent;
+    private Double acceptPercent;
     private Integer realNum;
-    private String numPercent;
+    private Double numPercent;
     private Double timeSum;
 
     public Long getCustUU() {
@@ -38,11 +38,11 @@ public class CustTrading {
         this.custName = custName;
     }
 
-    public String getAcceptPercent() {
+    public Double getAcceptPercent() {
         return acceptPercent;
     }
 
-    public void setAcceptPercent(String acceptPercent) {
+    public void setAcceptPercent(Double acceptPercent) {
         this.acceptPercent = acceptPercent;
     }
 
@@ -54,11 +54,11 @@ public class CustTrading {
         this.realNum = realNum;
     }
 
-    public String getNumPercent() {
+    public Double getNumPercent() {
         return numPercent;
     }
 
-    public void setNumPercent(String numPercent) {
+    public void setNumPercent(Double numPercent) {
         this.numPercent = numPercent;
     }
 

src/main/java/com/uas/platform/b2b/openapi/model/RecentOfMonth.java

@@ -16,11 +16,11 @@ public class RecentOfMonth {
 
     private Double oneMonth;
 
-    private String threeMonthNum;
+    private Double threeMonthNum;
 
-    private String twoMonthNum;
+    private Double twoMonthNum;
 
-    private String oneMonthNum;
+    private Double oneMonthNum;
 
     public String getName() {
         return name;
@@ -62,27 +62,27 @@ public class RecentOfMonth {
         this.oneMonth = oneMonth;
     }
 
-    public String getThreeMonthNum() {
+    public Double getThreeMonthNum() {
         return threeMonthNum;
     }
 
-    public void setThreeMonthNum(String threeMonthNum) {
+    public void setThreeMonthNum(Double threeMonthNum) {
         this.threeMonthNum = threeMonthNum;
     }
 
-    public String getTwoMonthNum() {
+    public Double getTwoMonthNum() {
         return twoMonthNum;
     }
 
-    public void setTwoMonthNum(String twoMonthNum) {
+    public void setTwoMonthNum(Double twoMonthNum) {
         this.twoMonthNum = twoMonthNum;
     }
 
-    public String getOneMonthNum() {
+    public Double getOneMonthNum() {
         return oneMonthNum;
     }
 
-    public void setOneMonthNum(String oneMonthNum) {
+    public void setOneMonthNum(Double oneMonthNum) {
         this.oneMonthNum = oneMonthNum;
     }
 

src/main/java/com/uas/platform/b2b/openapi/model/RecentOfYear.java

@@ -14,9 +14,9 @@ public class RecentOfYear {
 
     private Double thisYear;
 
-    private String oneYearNum;
+    private Double oneYearNum;
 
-    private String thisYearNum;
+    private Double thisYearNum;
 
     public String getName() {
         return name;
@@ -50,19 +50,19 @@ public class RecentOfYear {
         this.thisYear = thisYear;
     }
 
-    public String getOneYearNum() {
+    public Double getOneYearNum() {
         return oneYearNum;
     }
 
-    public void setOneYearNum(String oneYearNum) {
+    public void setOneYearNum(Double oneYearNum) {
         this.oneYearNum = oneYearNum;
     }
 
-    public String getThisYearNum() {
+    public Double getThisYearNum() {
         return thisYearNum;
     }
 
-    public void setThisYearNum(String thisYearNum) {
+    public void setThisYearNum(Double thisYearNum) {
         this.thisYearNum = thisYearNum;
     }
 

src/main/java/com/uas/platform/b2b/openapi/service/impl/TradingDataServiceImpl.java

@@ -45,7 +45,7 @@ public class TradingDataServiceImpl implements TradingDataService {
         // 获取累计发票金额
         Double apBillSum = getApBillSum(enUU);
         // 获取历史退货率
-        String historyReturn = NumFormat.getPercent(returnSum / getOrderSum(enUU));
+        Double historyReturn = NumFormat.getPercent(returnSum / getOrderSum(enUU));
         map.put("timeSum", timeSum);
         map.put("acceptSum", acceptSum);
         map.put("returnSum", returnSum);
@@ -68,7 +68,7 @@ public class TradingDataServiceImpl implements TradingDataService {
                 Double returnSum = getReturnSum(enUU, custTrading.getCustUU());
                 custTrading.setRealAccept(NumFormat.getTwo(acceptSum - returnSum));
                 if (StringUtils.isEmpty(acceptSum) || acceptSum == 0.0) {
-                    custTrading.setAcceptPercent("0.00%");
+                    custTrading.setAcceptPercent(0.00);
                 } else {
                     custTrading.setAcceptPercent(NumFormat.getPercent((acceptSum - returnSum) / sum));
                 }

src/main/java/com/uas/platform/b2b/openapi/support/NumFormat.java

@@ -24,7 +24,7 @@ public class NumFormat {
     public static Double getOne(Double result) {
         DecimalFormat df = new DecimalFormat("#.0");
         if (StringUtils.isEmpty(result)) {
-            return 0.00;
+            return 0.0;
         } else {
             return Double.parseDouble(df.format(result));
         }
@@ -39,11 +39,12 @@ public class NumFormat {
         }
     }
 
-    public static String getPercent(Double result) {
-        NumberFormat nt = NumberFormat.getPercentInstance();
+    public static Double getPercent(Double result) {
         //设置百分数精确度2即保留两位小数
-        nt.setMinimumFractionDigits(2);
-        return nt.format(result);
+        DecimalFormat dfPercent = new DecimalFormat("##.00%");
+        String resultStr = dfPercent.format(result);
+        String needStr = resultStr.substring(0, resultStr.length() - 1);
+        return getTwo(Double.valueOf(needStr));
     }
 
     public static java.sql.Date getTwoYear() {
@@ -72,7 +73,7 @@ public class NumFormat {
         return new java.sql.Date(ca.getTime().getTime());
     }
 
-    public static String getIncrease(Double last, Double now) {
+    public static Double getIncrease(Double last, Double now) {
         if ((last != 0.0) && (now != 0.0)) {
             return NumFormat.getPercent(now / last - 1);
         }
@@ -82,7 +83,7 @@ public class NumFormat {
         if (last != 0.0 && now == 0.0) {
             return NumFormat.getPercent(-last);
         }
-        return "0%";
+        return 0.0;
     }
 
     public static java.sql.Date getThreeM() {