From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..d53891f
--- 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;
@@ -82,7 +82,9 @@
BigDecimal priceDec = new BigDecimal(price);
- 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