From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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
old mode 100644
new mode 100755
index b5e7e44..40a805d
--- 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
@@ -2,9 +2,9 @@
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.feeDiscount.ComputeDiscountDto;
-import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
+import com.java110.dto.fee.ComputeDiscountDto;
+import com.java110.dto.fee.FeeDiscountDto;
+import com.java110.dto.fee.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -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