收益明细

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/response/UserGetWalletAccountVo.java

@@ -26,6 +26,9 @@ public class UserGetWalletAccountVo {
     @ApiModelProperty("可提现金额")
     private BigDecimal availableWithdrawBalance = BigDecimal.ZERO;
 
+    @ApiModelProperty("结算中金额")
+    private BigDecimal settlementBalance = BigDecimal.ZERO;
+
     @ApiModelProperty("总提现金额")
     private BigDecimal totalWithdrawBalance = BigDecimal.ZERO;
 

dating-agency-mall-server/src/main/java/com/qniao/dam/query/walletaccount/impl/WalletAccountQueryServiceImpl.java

@@ -76,6 +76,7 @@ public class WalletAccountQueryServiceImpl implements WalletAccountQueryService
                         .stream().map(WalletAccountRecord::getTradeAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
                 //可提现金额（参考工资为例,15号后结上一个月之前的，15-1-14则结算前两个月之前的）
                 walletAccountVo.setAvailableWithdrawBalance(countAvailableWithdrawBalance(walletAccount));
+                walletAccountVo.setSettlementBalance(walletAccount.getAvailableBalance().subtract(walletAccountVo.getAvailableWithdrawBalance()));
             }
         }
         return walletAccountVo;
@@ -133,7 +134,7 @@ public class WalletAccountQueryServiceImpl implements WalletAccountQueryService
                     eVo.setMatchmakerLevelVal(rVo.getMatchmakerLevel().getDesc());
                 }
                 eVo.setTradeTypeVal(rVo.getTradeType().getDesc());
-                eVo.setIsIncome(rVo.getIsIncome()?"收入":"支出");
+                eVo.setIsIncome(rVo.getIsIncome() ? "收入" : "支出");
             });
             list.add(exportVo);
         }