From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/QueryPayFeeDetailInnerServiceSMOImpl.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 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..9c284b8 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
@@ -3,13 +3,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.repair.RepairDto;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsTotalDto;
+import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
+import com.java110.dto.reportFee.ReportFeeMonthStatisticsTotalDto;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
@@ -29,10 +28,9 @@
/**
* 鏌ヨ缂磋垂鏄庣粏
- *
*/
@RestController
-public class QueryPayFeeDetailInnerServiceSMOImpl implements IQueryPayFeeDetailInnerServiceSMO{
+public class QueryPayFeeDetailInnerServiceSMOImpl implements IQueryPayFeeDetailInnerServiceSMO {
private int MAX_ROWS = 500; // 鏈�澶ц鏁�
@@ -88,14 +86,6 @@
if (count > 0) {
//鏌ヨ缂磋垂鏄庣粏
reportFeeMonthStatisticsDtos = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
- //鍚村鏂� 娉ㄩ噴 鎰熻鍜屼笂闈㈢殑369 鍔熻兘閲嶅
-// if (reportFeeMonthStatisticsDtos != null && reportFeeMonthStatisticsDtos.size() > 0) {
-// //鏌ヨ鎵�鏈夌即璐规槑缁嗚褰�
-// ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto1 = BeanConvertUtil.covertBean(reportFeeMonthStatisticsDto, ReportFeeMonthStatisticsDto.class);
-// reportFeeMonthStatisticsDto1.setPage(PageDto.DEFAULT_PAGE);
-// List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos1 = reportFeeMonthStatisticsInnerServiceSMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto1);
-// size = reportFeeMonthStatisticsDtos1.size();
-// }
//鏌ヨ搴旀敹銆佸疄鏀舵�婚噾棰�(澶ц)
List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsList = reportFeeMonthStatisticsInnerServiceSMOImpl.queryAllPayFeeDetail(reportFeeMonthStatisticsDto);
//鏌ヨ(浼樻儬銆佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛�)澶ц鎬婚噾棰�
@@ -107,27 +97,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;
}
}
//搴旀敹鎬婚噾棰�(灏忚)
@@ -148,12 +150,12 @@
Double totalLateFee = 0.0;
List<String> ownerIds = new ArrayList<>();
for (ReportFeeMonthStatisticsDto reportFeeMonthStatistics : reportFeeMonthStatisticsDtos) {
- FeeDetailDto feeDetailDto = new FeeDetailDto();
- feeDetailDto.setDetailId(reportFeeMonthStatistics.getDetailId());
- List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
- Assert.listOnlyOne(feeDetailDtos, "鏌ヨ璐圭敤鏄庣粏琛ㄩ敊璇�");
- reportFeeMonthStatistics.setReceivableAmount(feeDetailDtos.get(0).getReceivableAmount());
- reportFeeMonthStatistics.setPayableAmount(feeDetailDtos.get(0).getPayableAmount());
+// FeeDetailDto feeDetailDto = new FeeDetailDto();
+// feeDetailDto.setDetailId(reportFeeMonthStatistics.getDetailId());
+// List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+// Assert.listOnlyOne(feeDetailDtos, "鏌ヨ璐圭敤鏄庣粏琛ㄩ敊璇�");
+// reportFeeMonthStatistics.setReceivableAmount(feeDetailDtos.get(0).getReceivableAmount());
+// reportFeeMonthStatistics.setPayableAmount(feeDetailDtos.get(0).getPayableAmount());
//搴旀敹閲戦
Double receivableAmount = Double.valueOf(reportFeeMonthStatistics.getReceivableAmount());
//瀹炴敹閲戦
--
Gitblit v1.8.0