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/DiscountFeeRule.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
index ebcd2ef..18ae23c 100644
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
@@ -73,7 +73,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;
}
//鏌ヨ璐圭敤
@@ -88,14 +96,14 @@
BigDecimal cycleDec = new BigDecimal(feeDiscountDto.getCycles());
- double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-
+ double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(1.0 - rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
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(discountPrice);
computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
return computeDiscountDto;
--
Gitblit v1.8.0