From 4d168e64ccafa3176e23a6df45f0d6d7ba469b41 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 23 七月 2022 13:25:56 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
index 2759ecb..0d98d3c 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -20,7 +20,6 @@
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.ListenerExecuteException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -34,9 +33,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.text.ParseException;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
import java.util.*;
@Service
@@ -184,13 +180,10 @@
feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
feeDto.setFeeTotalPrice(Double.parseDouble(feePriceAll.get("feeTotalPrice").toString()));
- if(!StringUtil.isEmpty(custEndTime)){
- try {
- computeFeeSMOImpl.dealRentRateCustEndTime(feeDto, DateUtil.getDateFromString(custEndTime,DateUtil.DATE_FORMATE_STRING_B));
- } catch (Exception e) {
- throw new CmdException("璁＄畻璐圭敤澶辫触"+e);
- }
- }else {
+ if (!StringUtil.isEmpty(custEndTime)) {
+ Date date = DateUtil.getDateFromStringB(custEndTime);
+ computeFeeSMOImpl.dealRentRateCustEndTime(feeDto, date);
+ } else {
computeFeeSMOImpl.dealRentRateCycle(feeDto, NumberUtil.getDouble(feeDto.getCycle()));
}
@@ -463,7 +456,7 @@
feePrice = 0.0;
} else if ("1101".equals(computingFormula)) { // 绉熼噾
feePrice = 0.0;
- }else if ("1102".equals(computingFormula)) { // 绉熼噾
+ } else if ("1102".equals(computingFormula)) { // 绉熼噾
feePrice = 0.0;
} else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
@@ -587,7 +580,7 @@
} else if ("1102".equals(computingFormula)) { // 绉熼噾
BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(tmpRoomDto.getRoomRent()));
feePrice = additionalAmount.setScale(3, BigDecimal.ROUND_HALF_EVEN).doubleValue();
- }else if ("4004".equals(computingFormula)) {
+ } else if ("4004".equals(computingFormula)) {
feePrice = Double.parseDouble(feeDto.getAmount());
} else if ("5005".equals(computingFormula)) {
--
Gitblit v1.8.0