From e8e8bcf8e418c95cf9df2787437376d44253cc2b Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 18 Mar 2024 08:37:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5bir=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BirActivityCenterGoodsServiceImpl.java    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

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 63badd5d..194e0fcc 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
@@ -26,6 +26,7 @@ import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
+import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenter;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
@@ -85,6 +86,34 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
 
     @Override
     public void rebuildBir(List<Long> costApplyIds) {
+        //不占预算的状态，进行清理
+        List<TbsCostApply> tbsCostApplyList = tbsCostApplyMapper.selectBatchIds(costApplyIds);
+        List<Long> rmIds = new ArrayList<>();
+        List<Long> buildIds = new ArrayList<>();
+        for (TbsCostApply costApply : tbsCostApplyList) {
+            if(costApply.getCancelFlag().equals(1)){
+                rmIds.add(costApply.getId());
+                continue;
+            }
+            Boolean useBudget = TbsCostApplyState.checkUseBudget(costApply.getChargeState());
+            if(useBudget!=null){
+                if(useBudget){
+                    buildIds.add(costApply.getId());
+                }else {
+                    rmIds.add(costApply.getId());
+                }
+            }
+        }
+        //移除历史记录
+        LambdaQueryWrapper<BirActivityCenterGoods> rmCostId = new LambdaQueryWrapper<>();
+        rmCostId.in(BirActivityCenterGoods::getCostApplyId,rmIds);
+        this.remove(rmCostId);
+
+        //过滤需要移除的ID
+        costApplyIds = buildIds;
+        if(CollectionUtil.isEmpty(costApplyIds)){
+            return;
+        }
 
         //刷新BirBaseActivity
         for (Long costApplyId : costApplyIds) {
@@ -133,6 +162,11 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
 
         for (Long activityId : collectMap.keySet()) {
 
+            //移除历史记录
+            LambdaQueryWrapper<BirActivityCenterGoods> rmActId = new LambdaQueryWrapper<>();
+            rmActId.eq(BirActivityCenterGoods::getActivityId,activityId);
+            this.remove(rmActId);
+
             TbsActivity activity = activityMapper.selectById(activityId);
             if(activity==null||activity.getCancelFlag().equals(1)){
                 continue;