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/VacantHousingDiscountImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java b/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java
old mode 100644
new mode 100755
index 78000bc..383f3ea
--- a/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java
@@ -4,7 +4,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;
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* 绌虹疆鎴挎墦鎶樿鍒�
@@ -78,11 +79,13 @@
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(month);
+ //BigDecimal cycleDec = new BigDecimal(month);
+ //2021-03-05 鏍规嵁缂磋垂 鏃堕暱鏉ョ畻 涓嶅簲璇ユ寜 鑷冲皯缂磋垂鏉ョ畻
+ 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