From 7f1d8adffe4294b888816cfa616fe0090aa13726 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 13 Jun 2024 13:01:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98bug?=
 =?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

---
 .../invest/service/impl/StatisticAnalysisImpl.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 81fd22c..8bd892f 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
@@ -1277,9 +1277,17 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
 
                     if(staticsTime.equals(monthString)){
                         double  total=vo.getInstallmentAmount()+vo.getTotalInterest();
+                        BigDecimal bigInstallmentAmount=new BigDecimal(decimalFormat.format( vo.getInstallmentAmount()));
+                        BigDecimal bigTotalInterest=new BigDecimal(decimalFormat.format( vo.getTotalInterest()));
                         BigDecimal bigDecimal=new BigDecimal(decimalFormat.format( total));
                         actualCreditBillMonth+=bigDecimal.doubleValue();
-                        details+=vo.getBankNameCode()+"借款金额（本息）"+bigDecimal.doubleValue()+"；<br/>";
+                        //2是信用卡，3是网贷
+                        if(vo.getType().equals("2")){
+                            details+=vo.getBankNameCode()+"于"+dateFormat.format(vo.getInstallmentDate())+"分期"+bigInstallmentAmount.doubleValue()+"，利息"+bigTotalInterest.doubleValue()+"，分期本息合计"+bigDecimal.doubleValue()+"，结清日期"+dateFormat.format(vo.getCloseDate())+"；<br/>";
+                        }
+                        if(vo.getType().equals("3")){
+                            details+=vo.getBankNameCode()+"于"+dateFormat.format(vo.getInstallmentDate())+"借款"+bigInstallmentAmount.doubleValue()+"，利息"+bigTotalInterest.doubleValue()+"，借款本息合计"+bigDecimal.doubleValue()+"，结清日期"+dateFormat.format(vo.getCloseDate())+"；<br/>";
+                        }
 
                     }
                 }