From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java
index af208fb..a558ed5 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/ListFeeListener.java
@@ -95,8 +95,8 @@
List<ApiFeeDataVo> fees = null;
if (count > 0) {
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- computeFeePrice(feeDtos);
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);//鏌ヨ璐圭敤椤圭洰
+ computeFeePrice(feeDtos);//璁＄畻璐圭敤
fees = BeanConvertUtil.covertBeanList(feeDtos, ApiFeeDataVo.class);
freshFeeAttrs(fees, feeDtos);
} else {
@@ -127,7 +127,6 @@
Map<String, Object> targetEndDateAndOweMonth = computeFeeSMOImpl.getTargetEndDateAndOweMonth(feeDto);
Date targetEndDate = (Date) targetEndDateAndOweMonth.get("targetEndDate");
double oweMonth = (double) targetEndDateAndOweMonth.get("oweMonth");
- //涓�娆℃�ц垂鐢�
if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())) { //鎴垮眿鐩稿叧
computeFeePriceByRoom(feeDto, oweMonth);
} else if (FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())) {//杞︿綅鐩稿叧
--
Gitblit v1.8.0