opt: 修改bir数据源

src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java

@@ -3,7 +3,6 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
 import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
@@ -20,7 +19,7 @@ import java.util.List;
  * @author YenHex
  * @date 2023-07-06
  */
-@DS(DSName.QiSheng)
+@DS("erp_stand_ds")
 public interface BirActivityCenterGoodsMapper extends BaseMapper<BirActivityCenterGoods> {
 
     //List<BirActivityCenterGoods> selectErrorBir();

src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java

@@ -3,7 +3,6 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.dto.UnMatchBirRecord;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
@@ -18,7 +17,7 @@ import java.util.List;
  * @author YenHex
  * @date 2023-06-05
  */
-@DS(DSName.QiSheng)
+@DS("erp_stand_ds")
 public interface BirBaseActivityMapper extends BaseMapper<BirBaseActivity> {
 
     //List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);

src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.model.dto.DateSplitDTO;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.util.DateSplitUtil;
+import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.BirRemoveId;
 import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO;
@@ -23,7 +26,6 @@ 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;
@@ -83,37 +85,6 @@ 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());
-                }
-            }
-        }
-        //移除历史记录
-        if(rmIds.size()>0){
-            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) {
@@ -162,11 +133,6 @@ 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;
@@ -208,12 +174,8 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
                     bacgList.add(entity);
                 }
             }
-//            if(bacgList.size()>0){
+            if(bacgList.size()>0){
-//                this.saveBatch(bacgList);
+                this.saveBatch(bacgList);
-//            }
-            for (BirActivityCenterGoods bir : bacgList) {
-                bir.setId(IdUtil.getSnowFlakeId());
-                super.getBaseMapper().insert(bir);
             }
         }
     }

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -6,7 +6,6 @@ import com.qs.serve.common.model.dto.DateSplitDTO;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.DateSplitUtil;
-import com.qs.serve.common.util.IdUtil;
 import com.qs.serve.modules.bir.entity.dto.UnMatchBirRecord;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
@@ -174,11 +173,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
 
         }
         //保存
-        //this.saveBatch(birBaseActivities);
+        this.saveBatch(birBaseActivities);
-        for (BirBaseActivity baseActivity : birBaseActivities) {
-            baseActivity.setId(IdUtil.getSnowFlakeId());
-            super.baseMapper.insert(baseActivity);
-        }
     }
 
     @Override