From e55ce18a91b05576571357252b732456a37bdb02 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Tue, 15 Aug 2023 17:06:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBIR=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8B=BF=E6=9C=80=E6=96=B0=E7=9A=84LIST=E5=88=86?=
 =?UTF-8?q?=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BirActivityCenterGoodsServiceImpl.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
index fac7bc30..2c29aa0b 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
@@ -77,7 +77,7 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
         LocalDate endDate = LocalDate.of(year,month,lastDayNum2);
         //加载所有异动的数据
         List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
-//        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,19596L);
+//        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,20637L);
         if(activityCenterGoodsAllList.size()<1){
             return;
         }
@@ -103,6 +103,12 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
 
         this.remove(birBaseActivityLqw);
 
+        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
+//        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,20637L);
+        if(activityCenterGoodsAllList.size()<1){
+            return;
+        }
+
         //加载所有自定义成本中心
         List<BmsCostCenter> costCenterList = costCenterMapper.selectList(new QueryWrapper<>());
 

From 8fc428fd80fca615159df2168185c4f7aec6c82e Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Tue, 15 Aug 2023 18:46:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BIR=E4=BF=AE=E5=A4=8D=E7=B2=BE=E5=BA=A6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BirActivityCenterGoodsServiceImpl.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
index 2c29aa0b..aba3b62a 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
@@ -37,6 +37,7 @@ import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
 import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -76,8 +77,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
         int lastDayNum2 = startDate.lengthOfMonth();
         LocalDate endDate = LocalDate.of(year,month,lastDayNum2);
         //加载所有异动的数据
-        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
-//        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,20637L);
+//        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
+        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
         if(activityCenterGoodsAllList.size()<1){
             return;
         }
@@ -103,8 +104,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
 
         this.remove(birBaseActivityLqw);
 
-        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
-//        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,20637L);
+//        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
+        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
         if(activityCenterGoodsAllList.size()<1){
             return;
         }
@@ -377,14 +378,14 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
                 if (splitDTO.getYearMonth().equals(currDateSplit.getYearMonth())) {
                     continue;
                 }
-                splitCenterGoodsAmount = splitCenterGoodsAmount.subtract(currentCenterGoodsAmount.multiply(dayRate));
-                splitCheckAmount = splitCheckAmount.subtract(currentCheckAmount.multiply(dayRate));
+                splitCenterGoodsAmount = splitCenterGoodsAmount.subtract(currentCenterGoodsAmount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
+                splitCheckAmount = splitCheckAmount.subtract(currentCheckAmount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP));
             }
         } else {
             BigDecimal dayRate = new BigDecimal(currDateSplit.getDays() + "")
                     .divide(new BigDecimal(currentActDays + ""), 4, BigDecimal.ROUND_HALF_DOWN);
-            splitCenterGoodsAmount = currentCenterGoodsAmount.multiply(dayRate);
-            splitCheckAmount = currentCheckAmount.multiply(dayRate);
+            splitCenterGoodsAmount = currentCenterGoodsAmount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
+            splitCheckAmount = currentCheckAmount.multiply(dayRate).setScale(2, RoundingMode.HALF_UP);
         }
         BirCenterGoodSplitDTO goodSplitDTO = new BirCenterGoodSplitDTO();
         goodSplitDTO.setCurrentSplitAmount(splitCenterGoodsAmount);

From 6fa6d2c22340de0a226598fcee1ef16ff336c31d Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Tue, 15 Aug 2023 18:46:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BIR=E4=BF=AE=E5=A4=8D=E7=B2=BE=E5=BA=A6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BirActivityCenterGoodsServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
index aba3b62a..8a45d528 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
@@ -77,8 +77,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
         int lastDayNum2 = startDate.lengthOfMonth();
         LocalDate endDate = LocalDate.of(year,month,lastDayNum2);
         //加载所有异动的数据
-//        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
-        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
+        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
+//        List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
         if(activityCenterGoodsAllList.size()<1){
             return;
         }
@@ -104,8 +104,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
 
         this.remove(birBaseActivityLqw);
 
-//        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
-        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
+        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
+//        activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
         if(activityCenterGoodsAllList.size()<1){
             return;
         }