From 9e22e9abd4a3c606ec51d491abf94d7a465356b9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 30 六月 2023 00:35:56 +0800
Subject: [PATCH] 优化商户
---
service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java
index b5b4b5a..5e06e31 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportConfigFeeSummaryCmd.java
@@ -55,6 +55,7 @@
BigDecimal feeRoomRate = null;
BigDecimal hisOweFee = null;
BigDecimal curReceivableFee = null;
+ BigDecimal hisReceivedFee = null;
BigDecimal receivedFee = null;
BigDecimal preReceivedFee = null;
for (Map data : datas) {
@@ -71,7 +72,8 @@
//todo 璁＄畻 鏀惰垂鐜�
hisOweFee = new BigDecimal(Double.parseDouble(data.get("hisOweFee").toString()));
curReceivableFee = new BigDecimal(Double.parseDouble(data.get("curReceivableFee").toString()));
- hisOweFee = curReceivableFee.add(hisOweFee);
+ hisReceivedFee = new BigDecimal(Double.parseDouble(data.get("hisReceivedFee").toString()));
+ hisOweFee = curReceivableFee.add(hisOweFee).add(hisReceivedFee);
if (hisOweFee.doubleValue() > 0) {
receivedFee = new BigDecimal(Double.parseDouble(data.get("receivedFee").toString()));
--
Gitblit v1.8.0