From bfcf3f83c012d7ba36aee4d84a45536e1b912b07 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 26 一月 2021 11:38:39 +0800
Subject: [PATCH] 新增报修通知,优化优惠折扣最大缴费时间问题

---
 service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
index 349da7d..5092b4f 100644
--- a/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java
@@ -423,7 +423,14 @@
                 BigDecimal squarePrice = new BigDecimal(Double.parseDouble(feeDto.getSquarePrice()));
                 BigDecimal builtUpArea = new BigDecimal(Double.parseDouble(roomDtos.get(0).getBuiltUpArea()));
                 BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));
-                feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                //鑾峰彇鏀粯鏂瑰紡
+                String primeRate = paramInJson.getString("primeRate");
+                //鍒ゆ柇鏄惁鏄嚎涓婃敮浠�
+                if (primeRate.equals("5") || primeRate.equals("6")) {
+                    feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount);
+                } else {
+                    feePrice = squarePrice.multiply(builtUpArea).add(additionalAmount).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+                }
             } else if ("2002".equals(computingFormula)) { // 鍥哄畾璐圭敤
                 //feePrice = Double.parseDouble(feeDto.getAdditionalAmount());
                 BigDecimal additionalAmount = new BigDecimal(Double.parseDouble(feeDto.getAdditionalAmount()));

--
Gitblit v1.8.0