计算金额 类型问题

cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterTopVO.java

@@ -13,28 +13,29 @@ public class DistributionCenterTopVO {
     /**
      * 总收益
      */
-    private String totalIncome;
+    private Double totalIncome;
     /**
      * 待入账
      */
-    private String pendingIncome;
+    private Double pendingIncome;
     /**
      * 已提现
      */
-    private String cashOutAmount;
+    private Double cashOutAmount;
 
-    public String getTotalIncome() {
-        return totalIncome == null ? "0" : totalIncome;
-    }
-    public String getPendingIncome() {
-        return pendingIncome == null ? "0" : pendingIncome;
+    public Double getTotalIncome() {
+        return totalIncome == null ? 0.0 : totalIncome;
     }
 
-    public String getCashOutAmount() {
-        return cashOutAmount == null ? "0" : cashOutAmount;
+    public Double getPendingIncome() {
+        return pendingIncome == null ? 0.0 : pendingIncome;
     }
 
-    public String getUnCashOutAmount() {
-        return new BigDecimal(getTotalIncome()).subtract(new BigDecimal(getPendingIncome())).subtract(new BigDecimal(getCashOutAmount())).toString();
+    public Double getCashOutAmount() {
+        return cashOutAmount == null ? 0.0 : cashOutAmount;
+    }
+
+    public Double getUnCashOutAmount() {
+        return getTotalIncome() - getPendingIncome() - getCashOutAmount();
     }
 }