From 77ccfcfe9ae0a2dde9c2cc7fcf94c5248e6045ca Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 24 Jul 2024 16:31:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8Bbug=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/invest/domain/dto/AccountsDto.java  |  4 ++++
 .../com/ruoyi/invest/domain/dto/BankCardLendDto.java   |  4 ++++
 .../invest/service/impl/StatisticAnalysisImpl.java     | 10 ++++++----
 .../main/resources/mapper/invest/AccountsMapper.xml    |  1 +
 .../resources/mapper/invest/BankCardLendMapper.xml     |  1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
index 116b746..1c485b4 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
@@ -42,4 +42,8 @@ public class AccountsDto extends BaseEntity implements Serializable
     @ApiModelProperty(value="储蓄卡类型")
     private String debitType;
 
+    /** 还款账户标识，不为空时，查询储蓄卡和网络账户 */
+    @ApiModelProperty(value="还款账户flag")
+    private String repayFlag;
+
 }
diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java
index 82211d4..a60d58a 100644
--- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java
+++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java
@@ -46,4 +46,8 @@ public class BankCardLendDto  extends BaseEntity implements Serializable
     @ApiModelProperty(value="账户状态")
     private String status;
 
+    /** 还款账户标识，不为空时，查询储蓄卡和网络账户 */
+    @ApiModelProperty(value="还款账户flag")
+    private String repayFlag;
+
 }
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 49c4404..633cd92 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
@@ -1615,12 +1615,14 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         dto.setStatus("1");
         //储蓄卡
         dto.setType("1");
+        //只计算储蓄卡和网络账户的余额
+        dto.setRepayFlag("1");
         List<AccountsVo> accountsList=accountsMapper.selectAccountsList(dto);
         double debetBalance =0;
         if(accountsList.size()>0){
             debetBalance=accountsList.stream().mapToDouble(AccountsVo::getAvailableLimit).sum();
         }
-        map.put("debetBalance",decimalFormat.format(debetBalance));
+        map.put("debitBalance",decimalFormat.format(debetBalance));
 
         //信用卡
         dto.setType("2");
@@ -1646,11 +1648,11 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         //借贷账户
         dto.setType("3");
         accountsList=accountsMapper.selectAccountsList(dto);
-        double debitBalance =0;
+        double lendAccountBalance =0;
         if(accountsList.size()>0){
-            debitBalance=accountsList.stream().mapToDouble(AccountsVo::getAvailableLimit).sum();
+            lendAccountBalance=accountsList.stream().mapToDouble(AccountsVo::getAvailableLimit).sum();
         }
-        map.put("debitBalance",decimalFormat.format(debitBalance));
+        map.put("lendAccountBalance",decimalFormat.format(lendAccountBalance));
 
         dto.setType(analysisDto.getDataType());
 
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
index e0a5028..34c4e21 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="state != null  and state != ''"> and a.state = #{state}</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
             <if test="accountId != null  and accountId != ''"> and a.account_id = #{accountId}</if>
+            <if test="repayFlag != null  and repayFlag != ''"> and  bcl.debit_type in('1','2','3')</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml
index 7ed8ff3..d0c44d4 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml
@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditCardId != null "> and a.id = #{creditCardId}</if>
             <if test="lendType != null  and lendType != ''"> and a.lend_type = #{lendType}</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
+            <if test="repayFlag != null  and repayFlag != ''"> and  a.debit_type in('1','2','3')</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}