需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/settlement/SettlementAmountBean.java

@@ -15,6 +15,10 @@ public class SettlementAmountBean {
     private BigDecimal txz;
     @ApiModelProperty("待结算")
     private BigDecimal djs;
-    @ApiModelProperty("已提现")
-    private BigDecimal ytx;
+    @ApiModelProperty("已结算")
+    private BigDecimal yjs;
+
+
+    @ApiModelProperty("总收益")
+    private BigDecimal zsy;
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/withdrawal/WithdrawalLogic.java

@@ -212,21 +212,33 @@ public class WithdrawalLogic {
                 .filter(v -> StringUtils.equals(v.getStatus(),SettlementStatusEnum.ING.getKey()))
                 .map(SettlementOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
+        List<String> stringsDjs = new ArrayList<>();
+
+        stringsDjs.add("WAIT");
+        stringsDjs.add("YC");
+
+
         //待结算
         BigDecimal djs = list.stream()
-                .filter(v -> StringUtils.equals(v.getStatus(),SettlementStatusEnum.WAIT.getKey()))
+                .filter(v -> stringsDjs.contains(v.getStatus()))
                 .map(SettlementOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
+        List<String> strings = new ArrayList<>();
+
+        strings.add("OK");
+        strings.add("LINE");
+
         //已到账
         BigDecimal ydz = list.stream()
-                .filter(v -> StringUtils.equals(v.getStatus(),SettlementStatusEnum.OVER.getKey()))
+                .filter(v -> strings.contains(v.getStatus()))
                 .map(SettlementOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
         SettlementAmountBean bean = new SettlementAmountBean();
         bean.setKtx(ktx);
         bean.setTxz(txz);
         bean.setDjs(djs);
-        bean.setYtx(ydz);
+        bean.setYjs(ydz);
+        bean.setZsy(djs.add(ydz));
         return bean;
     }