From 90322172776238827dbf6ab7bcec856504ef542e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 06 十二月 2020 19:25:33 +0800
Subject: [PATCH] 加入违约金问题
---
service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java
index 1c232cb..9dd7440 100644
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java
@@ -71,7 +71,15 @@
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;
}
//鏌ヨ璐圭敤
Double month = computeFeeSMOImpl.dayCompare(curTime, endTime);
@@ -89,7 +97,8 @@
computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_V);
computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
- computeDiscountDto.setDiscountPrice(discountPrice);
+ computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
+ computeDiscountDto.setDiscountPrice(discountPrice * -1);
computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
return computeDiscountDto;
}
--
Gitblit v1.8.0