From a15b8e553f1b117cf36f6872412e7bedceed885a Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 24 Jan 2025 09:50:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StatisticAnalysisImpl.java   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/StatisticAnalysisImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/StatisticAnalysisImpl.java
index 56e093f..a4a6672 100644
--- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/StatisticAnalysisImpl.java
+++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/StatisticAnalysisImpl.java
@@ -1054,12 +1054,27 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         detailDto.setState("0");
         detailDto.setBankCardLendId(analysisDto.getId());
         List<InstallmentHistoryDetailVo> detailList=installmentHistoryDetailMapper.selectInstallmentHistoryDetailList(detailDto);
+        //未结清本息
         double unClearedDetail = 0;
         if(detailList.size()>0){
             unClearedDetail=detailList.stream().mapToDouble(InstallmentHistoryDetailVo::getCurrentAmount).sum();
         }
         map.put("unClearedDetail",decimalFormat.format(unClearedDetail));
 
+        //未结清本金
+        double unClearedPrincipal = 0;
+        if(detailList.size()>0){
+            unClearedPrincipal=detailList.stream().mapToDouble(InstallmentHistoryDetailVo::getPrincipal).sum();
+        }
+        map.put("unClearedPrincipal",decimalFormat.format(unClearedPrincipal));
+
+        //未结清利息
+        double unClearedInterest = 0;
+        if(detailList.size()>0){
+            unClearedInterest=detailList.stream().mapToDouble(InstallmentHistoryDetailVo::getInterest).sum();
+        }
+        map.put("unClearedInterest",decimalFormat.format(unClearedInterest));
+
         //未结清账户数
         installmentHistoryDto.setState("0");
         installmentHistoryDto.setType(analysisDto.getDataType());
@@ -1081,6 +1096,18 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
         }
         map.put("dueDetail",decimalFormat.format(dueDetail));
 
+        double dueInterest =0;
+        if(detailList.size()>0){
+            dueInterest=detailList.stream().mapToDouble(InstallmentHistoryDetailVo::getInterest).sum();
+        }
+        map.put("dueInterest",decimalFormat.format(dueInterest));
+
+        double duePrincipal =0;
+        if(detailList.size()>0){
+            duePrincipal=detailList.stream().mapToDouble(InstallmentHistoryDetailVo::getPrincipal).sum();
+        }
+        map.put("duePrincipal",decimalFormat.format(duePrincipal));
+
         //网贷当月已还款
         detailDto.setState("1");
         detailDto.setType(analysisDto.getDataType());