From 46eed722cd0431aa433bea2470b23015b8d83b3e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 二月 2022 10:03:25 +0800
Subject: [PATCH] 优化三亚物业 临时收费问题
---
service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
old mode 100644
new mode 100755
index ebcd2ef..e594b4a
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.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 org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +27,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* 浼樻儬鎵撴姌 瑙勫垯
@@ -73,7 +74,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;
}
//鏌ヨ璐圭敤
@@ -82,20 +91,20 @@
feeDto.setFeeId(feeDiscountDto.getFeeId());
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
- 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 cycleDec = new BigDecimal(feeDiscountDto.getCycles());
- double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
-
+ double discountPrice = priceDec.multiply(cycleDec).multiply(new BigDecimal(1.0 - rate)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
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(discountPrice);
computeDiscountDto.setFeeDiscountSpecs(feeDiscountSpecDtos);
return computeDiscountDto;
--
Gitblit v1.8.0