From 4c9d11625686d2ef54b8ac7337b3c5c0b0175a6a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 26 二月 2024 09:47:26 +0800
Subject: [PATCH] 优化查询缴费明细

---
 service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java
index 443c4d6..6f15adc 100644
--- a/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java
@@ -169,6 +169,8 @@
     private void computeTotalInfo(ReportFeeMonthStatisticsTotalDto reportFeeMonthStatisticsTotalDto,
                                   List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos) {
 
+        BigDecimal totalReceivableAmount = new BigDecimal(0.00);
+
         BigDecimal totalReceivedAmount = new BigDecimal(0.00);
         BigDecimal totalPreferentialAmount = new BigDecimal(0.00);
         BigDecimal totalDeductionAmount = new BigDecimal(0.00);
@@ -176,6 +178,7 @@
         BigDecimal totalGiftAmount = new BigDecimal(0.00);
 
         for (ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto : reportFeeMonthStatisticsDtos) {
+            totalReceivableAmount = totalReceivableAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getReceivableAmount()));
             totalReceivedAmount = totalReceivedAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getReceivedAmount()));
             totalPreferentialAmount = totalPreferentialAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getDiscountAmount()));
             totalDeductionAmount = totalDeductionAmount.add(new BigDecimal(reportFeeMonthStatisticsDto.getDeductionAmount()));
@@ -187,13 +190,16 @@
             reportFeeMonthStatisticsDto.setLateFee(reportFeeMonthStatisticsDto.getLateAmount());
         }
 
+        //todo 搴旀敹閲戦(灏忚)
+        reportFeeMonthStatisticsTotalDto.setTotalReceivableAmount(String.format("%.2f", totalReceivableAmount.doubleValue()));
+
         //todo 瀹炴敹閲戦(灏忚)
         reportFeeMonthStatisticsTotalDto.setTotalReceivedAmount(String.format("%.2f", totalReceivedAmount.doubleValue()));
-        //浼樻儬閲戦(灏忚)
+        //todo 浼樻儬閲戦(灏忚)
         reportFeeMonthStatisticsTotalDto.setTotalPreferentialAmount(String.format("%.2f", totalPreferentialAmount));
-        //鍑忓厤閲戦(灏忚)
+        //todo 鍑忓厤閲戦(灏忚)
         reportFeeMonthStatisticsTotalDto.setTotalDeductionAmount(String.format("%.2f", totalDeductionAmount));
-        //婊炵撼閲�(灏忚)
+        //todo 婊炵撼閲�(灏忚)
         reportFeeMonthStatisticsTotalDto.setTotalLateFee(String.format("%.2f", totalLateFee));
 
     }

--
Gitblit v1.8.0