fix: 首页数据,新增投资账户余额。
This commit is contained in:
@@ -72,8 +72,16 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
|
||||
futureStocksBillList=futureStocksBillMapper.selectFutureStocksBillList(futureStocksBillDto);
|
||||
double stocksIncome = futureStocksBillList.stream().mapToDouble(FutureStocksBillVo::getBillAmount).sum();
|
||||
map.put("stocksIncome",decimalFormat.format(stocksIncome));
|
||||
//其他收益
|
||||
map.put("otherIncome","0");
|
||||
AccountsDto dto=new AccountsDto();
|
||||
dto.setState("1");
|
||||
//投资账户余额
|
||||
dto.setType("5");
|
||||
List<AccountsVo> accountsList=accountsMapper.selectAccountsList(dto);
|
||||
double investBalance =0;
|
||||
if(accountsList.size()>0){
|
||||
investBalance=accountsList.stream().mapToDouble(AccountsVo::getAvailableLimit).sum();
|
||||
}
|
||||
map.put("investBalance",decimalFormat.format(investBalance));
|
||||
//总收益
|
||||
map.put("totalIncome",decimalFormat.format(futuresIncome+stocksIncome));
|
||||
|
||||
@@ -140,6 +148,16 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
|
||||
}
|
||||
map.put("creditBalance",decimalFormat.format(creditBalance));
|
||||
|
||||
dto.setState("1");
|
||||
//投资账户余额
|
||||
dto.setType("5");
|
||||
accountsList=accountsMapper.selectAccountsList(dto);
|
||||
double investBalance =0;
|
||||
if(accountsList.size()>0){
|
||||
investBalance=accountsList.stream().mapToDouble(AccountsVo::getAvailableLimit).sum();
|
||||
}
|
||||
map.put("investBalance",decimalFormat.format(investBalance));
|
||||
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
|
||||
SimpleDateFormat formatterMonth = new SimpleDateFormat("yyyy-MM");
|
||||
//未结清网贷数据
|
||||
@@ -184,7 +202,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
|
||||
//总负债
|
||||
map.put("totalDebt",decimalFormat.format(unClearedOnlineDebt+creditBalance+peopleLendHistory));
|
||||
//净资产
|
||||
map.put("netAsset",decimalFormat.format(debetBalance-unClearedOnlineDebt-creditBalance-peopleLendHistory));
|
||||
map.put("netAsset",decimalFormat.format(investBalance+debetBalance-unClearedOnlineDebt-creditBalance-peopleLendHistory));
|
||||
|
||||
//未结清账户数
|
||||
installmentHistoryDto.setState("0");
|
||||
|
||||
Reference in New Issue
Block a user