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 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" and a.state = #{state} and a.status = #{status} and a.account_id = #{accountId} + and bcl.debit_type in('1','2','3') ${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" and a.id = #{creditCardId} and a.lend_type = #{lendType} and a.status = #{status} + and a.debit_type in('1','2','3') ${params.dataScope}