From df3192f4e98377526d098928a9910c03e836c630 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 22:02:36 +0800
Subject: [PATCH] 优化戴拿
---
service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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
old mode 100644
new mode 100755
index 95b2be5..67beb28
--- 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
@@ -19,7 +19,7 @@
import com.java110.dto.fee.FeeDto;
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 com.java110.utils.util.DateUtil;
@@ -71,10 +71,18 @@
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);
+ Double month = computeFeeSMOImpl.dayCompare(endTime, curTime);
double price = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
@@ -90,7 +98,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