From 498b380556f9efa208f3c5d2cd39a0d6bccb5760 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 29 May 2024 13:49:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8A=95=E8=B5=84=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StatisticAnalysisImpl.java   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
index 08aeb9b..81fd22c 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
@@ -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");