From dbfbf79dc8e769d9202894261bfaeeb3dc5f3099 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 17 Aug 2023 17:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=88=86=E5=89=B2=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bir/controller/BirRoiRateController.java      | 2 +-
 .../bir/service/impl/BirBaseActivityServiceImpl.java      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
index 09f2f9db..5ce7f2ca 100644
--- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
+++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
@@ -142,7 +142,7 @@ public class BirRoiRateController {
 
     /**
      * 获取成本中心费率
-     * @param id
+     * @param
      * @return
      */
     @RepeatSubmit
diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
index be31ce00..8c862d00 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
@@ -111,15 +111,15 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
                             //日期占比
                             BigDecimal dayRate = new BigDecimal(splitDTO.getDays() + "")
                                     .divide(new BigDecimal(currentActDays + ""), 2, BigDecimal.ROUND_HALF_DOWN);
-                            currentAmount = currentAmount.subtract(amount.multiply(dayRate));
-                            currentCheckAmount = currentCheckAmount.subtract(activity.getUsedAmount().multiply(dayRate));
+                            currentAmount = currentAmount.subtract(amount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
+                            currentCheckAmount = currentCheckAmount.subtract(activity.getUsedAmount().multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
                         }
                     } else {
                         //日期占比
                         BigDecimal dayRate = new BigDecimal(currDateSplit.getDays() + "")
                                 .divide(new BigDecimal(currentActDays + ""), 2, BigDecimal.ROUND_HALF_DOWN);
-                        currentAmount = amount.multiply(dayRate);
-                        currentCheckAmount = activity.getUsedAmount().multiply(dayRate);
+                        currentAmount = amount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
+                        currentCheckAmount = activity.getUsedAmount().multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
                     }
 
                     baseActivity.setKeyNum(dto.getYearMonth());