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 costApplyIds) { + //不占预算的状态,进行清理 + List tbsCostApplyList = tbsCostApplyMapper.selectBatchIds(costApplyIds); + List rmIds = new ArrayList<>(); + List 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 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 rmActId = new LambdaQueryWrapper<>(); + rmActId.eq(BirActivityCenterGoods::getActivityId,activityId); + this.remove(rmActId); + TbsActivity activity = activityMapper.selectById(activityId); if(activity==null||activity.getCancelFlag().equals(1)){ continue;