From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 561a0ca..cfcab5f 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
@@ -29,10 +29,9 @@
/**
* 鏌ヨ缂磋垂鏄庣粏
- *
*/
@RestController
-public class QueryPayFeeDetailInnerServiceSMOImpl implements IQueryPayFeeDetailInnerServiceSMO{
+public class QueryPayFeeDetailInnerServiceSMOImpl implements IQueryPayFeeDetailInnerServiceSMO {
private int MAX_ROWS = 500; // 鏈�澶ц鏁�
@@ -107,27 +106,39 @@
String discountPrice = reportFeeMonthStatistics.getDiscountPrice();
//浼樻儬閲戦(澶ц)
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("1")) {
- allPreferentialAmount = Double.valueOf(discountPrice);
+// allPreferentialAmount = Double.valueOf(discountPrice);
+ Double aDouble = Double.valueOf(discountPrice);
+ allPreferentialAmount = allPreferentialAmount + aDouble;
}
//鍑忓厤閲戦(澶ц)
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("2")) {
- allDeductionAmount = Double.valueOf(discountPrice);
+ //allDeductionAmount = Double.valueOf(discountPrice);
+ Double aDouble = Double.valueOf(discountPrice);
+ allDeductionAmount = allDeductionAmount + aDouble;
}
//婊炵撼閲�(澶ц)
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("3")) {
- allLateFee = Double.valueOf(discountPrice);
+// allLateFee = Double.valueOf(discountPrice);
+ Double aDouble = Double.valueOf(discountPrice);
+ allLateFee = allLateFee + aDouble;
}
//绌虹疆鎴挎墦鎶橀噾棰�(澶ц)
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("4")) {
- allVacantHousingDiscount = Double.valueOf(discountPrice);
+// allVacantHousingDiscount = Double.valueOf(discountPrice);
+ Double aDouble = Double.valueOf(discountPrice);
+ allVacantHousingDiscount = allVacantHousingDiscount + aDouble;
}
//绌虹疆鎴垮噺鍏嶉噾棰�(澶ц)
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("5")) {
- allVacantHousingReduction = Double.valueOf(discountPrice);
+// allVacantHousingReduction = Double.valueOf(discountPrice);
+ Double aDouble = Double.valueOf(discountPrice);
+ allVacantHousingReduction = allVacantHousingReduction + aDouble;
}
//璧犻�侀噾棰�(澶ц)
if (!StringUtil.isEmpty(reportFeeMonthStatistics.getDiscountSmallType()) && reportFeeMonthStatistics.getDiscountSmallType().equals("6")) {
- allGiftAmount = Double.valueOf(discountPrice);
+// allGiftAmount = Double.valueOf(discountPrice);
+ Double aDouble = Double.valueOf(discountPrice);
+ allGiftAmount = allGiftAmount + aDouble;
}
}
//搴旀敹鎬婚噾棰�(灏忚)
--
Gitblit v1.8.0