From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码

---
 service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 4e8553d..81220d9
--- 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;
@@ -29,6 +29,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @desc add by 鍚村鏂� 12:43
@@ -82,11 +83,11 @@
             return computeDiscountDto;
         }
         //鏌ヨ璐圭敤
-        Double month = computeFeeSMOImpl.dayCompare(curTime, endTime);
+        Double month = computeFeeSMOImpl.dayCompare(endTime, curTime);
 
-        double price = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
+        Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
 
-        BigDecimal priceDec = new BigDecimal(price);
+        BigDecimal priceDec = new BigDecimal(feePriceAll.get("feePrice").toString());
 
         BigDecimal monthDec = new BigDecimal(month);
 
@@ -98,7 +99,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