From 40302884d40c2daceb291ca793a580988427f372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 九月 2021 12:06:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wangfy-dev'
---
service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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
old mode 100644
new mode 100755
index 630d834..cef58c0
--- 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
@@ -17,7 +17,7 @@
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -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