From 6543cd42661e2f55b28bdc354022a57885d549de Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 三月 2021 09:19:49 +0800
Subject: [PATCH] 优化公摊问题
---
service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java
index 630d834..95b97cb 100644
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java
@@ -68,7 +68,15 @@
}
if (feeDiscountDto.getCycles() < month) {
- return null;
+ ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
+ computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
+ computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D);
+ computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
+ computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
+ computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
+ computeDiscountDto.setDiscountPrice(0.0);
+ computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
+ return computeDiscountDto;
}
Double cycle = feeDiscountDto.getCycles() / month;
@@ -81,6 +89,7 @@
computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D);
computeDiscountDto.setRuleId(feeDiscountDto.getRuleId());
computeDiscountDto.setRuleName(feeDiscountDto.getRuleName());
+ computeDiscountDto.setDiscountName(feeDiscountDto.getDiscountName());
computeDiscountDto.setDiscountPrice(discountPrice);
computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
return computeDiscountDto;
--
Gitblit v1.8.0