From 8a18fb0eb70fc642d5043995905d78ebdfc17c25 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 29 十一月 2020 23:24:54 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java
index b1d0d65..2f13c09 100644
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java
@@ -71,13 +71,29 @@
Date endTime = feeDtos.get(0).getEndTime();
if (endTime.getTime() > curTime.getTime()) {
- return null;
+ ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
+ computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
+ computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_V);
+ computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
+ computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
+ computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
+ computeDiscountDto.setDiscountPrice(0.0);
+ computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
+ return computeDiscountDto;
}
//鏌ヨ璐圭敤
int day = DateUtil.daysBetween(curTime, endTime);
if (day < 1) {
- return null;
+ ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
+ computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
+ computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_V);
+ computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
+ computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
+ computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
+ computeDiscountDto.setDiscountPrice(0.0);
+ computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
+ return computeDiscountDto;
}
double price = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
--
Gitblit v1.8.0