From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java
index b5e7e44..45c136c 100755
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java
@@ -13,6 +13,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 鎵撴姌鏃犳瑺璐硅鍒�
@@ -95,7 +96,7 @@
//澶╂暟涓嶅ぇ浜�1澶╂椂鎸�1澶╂潵绠�
day = (date.getTime() - endTime.getTime()) / (1000 * 60 * 60 * 24) + 1;
}
- if (day >= arrearsDay) {
+ if (day > arrearsDay) {
ComputeDiscountDto computeDiscountDto = new ComputeDiscountDto();
computeDiscountDto.setDiscountId(feeDiscountDto.getDiscountId());
computeDiscountDto.setDiscountType(FeeDiscountDto.DISCOUNT_TYPE_D);
@@ -106,8 +107,8 @@
computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
return computeDiscountDto;
}
- double price = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
- BigDecimal priceDec = new BigDecimal(price);
+ Map feePriceAll = computeFeeSMOImpl.getFeePrice(feeDtos.get(0));
+ BigDecimal priceDec = new BigDecimal(feePriceAll.get("feePrice").toString());
BigDecimal cycleDec = new BigDecimal(feeDiscountDto.getCycles());
double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(1.0 - rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
--
Gitblit v1.8.0