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/LateFeeByDayRule.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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..2a48d0e 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));
@@ -86,7 +102,7 @@
BigDecimal dayDec = new BigDecimal(day);
- double discountPrice = priceDec.divide(new BigDecimal(30)).multiply(new BigDecimal(rate)).multiply(dayDec).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ double discountPrice = priceDec.divide(new BigDecimal(30), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(rate)).multiply(dayDec).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
@@ -94,7 +110,7 @@
computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
- computeDiscountDto.setDiscountPrice(discountPrice);
+ computeDiscountDto.setDiscountPrice(discountPrice * -1);
computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
return computeDiscountDto;
}
--
Gitblit v1.8.0