fix：修复协议类费用状态异常；

fix：删除接口拦截忽略不存在核销情况

src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java

@@ -91,8 +91,8 @@ public class BirActivityCenterGoodsController {
 
     @GetMapping("/toSyncBirToday")
     public R<?> toSyncBirEcro2(){
-        //Long[] ids = new Long[]{301897L};
+        Long[] ids = new Long[]{0L};
-        List<Long> ids = tbsActivityMapper.selectReleaseCostIds();
+        //List<Long> ids = tbsActivityMapper.selectReleaseCostIds();
         //Set<Long> ids = tbsActivityCenterGoodsMapper.selectUpdateCostApplyIds();
         List<Long> errIds = new ArrayList<>();
         for (Long id : ids) {

src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java

@@ -74,7 +74,8 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         costDeletion.setVerificationCode(costApply.getCode());
         String rs = HttpUtil.doPost(url, JsonUtil.objectToJson(costDeletion),null);
 
-        if(!rs.contains("200")){
+        log.warn("【请求删除ERP费用】{},返回结果：{}",costApplyId,rs);
+        if(!rs.contains("200")&&!rs.contains("核销档案不存在该编码")){
             Assert.throwEx("远程删除失败:"+rs);
         }
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java

@@ -367,7 +367,14 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                                      List<TbsActivityChannel> activityChannelList,
                                      List<TbsActivityChannelPoint> activityChannelPointList){
         if(CollectionUtil.isNotEmpty(activityBo.getActivityChannelList())){
+            Set<Long> channelIds = new HashSet<>();
             for (TbsActivityChannelBo activityChannelBo : activityBo.getActivityChannelList()) {
+                //排除重复
+                boolean existChannelIds = channelIds.stream().anyMatch(a->a.equals(activityChannelBo.getChannelId()));
+                if(existChannelIds){
+                    continue;
+                }
+                channelIds.add(activityChannelBo.getChannelId());
                 BmsChannel channel = channelService.getById(activityChannelBo.getChannelId());
                 TbsActivityChannel activityChannel = new TbsActivityChannel();
                 activityChannel.setActivityId(activity.getId());
@@ -382,6 +389,7 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                 activityChannelList.add(activityChannel);
             }
         }else if(CollectionUtil.isNotEmpty(activityBo.getActivityPointList())){
+            Set<Long> channelPointIds = new HashSet<>();
             for (TbsActivityChannelPointBo activityChannelPointBo : activityBo.getActivityPointList()) {
                 BmsChannelPoint channelPoint = channelPointService.getById(activityChannelPointBo.getPointId());
                 if(channelPoint==null){
@@ -395,6 +403,12 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                 if(channel.getId().equals(activity.getSupplierId())){
                     Assert.throwEx("请检查活动网点数据");
                 }
+                //排除重复
+                boolean existChannelPointIds = channelPointIds.stream().anyMatch(a->a.equals(activityChannelPointBo.getPointId()));
+                if(existChannelPointIds){
+                    continue;
+                }
+                channelPointIds.add(activityChannelPointBo.getPointId());
 
                 TbsActivityChannelPoint activityChannelPoint = new TbsActivityChannelPoint();
                 activityChannelPoint.setCostApplyId(costApply.getId());

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -1245,9 +1245,8 @@ public class PortalOfCostApplication {
         if(subjectSurplus.compareTo(BigDecimal.ZERO)>0){
             Assert.throwEx("余额不足");
         }
-        //判断金额是否用完，用完直接更新状态
+        // 修复没有vtbFundFlow异常，并修复活动状态
-        //根据ActivitySubject更新活动金额
+        verificationService.successCommit(verification.getId(),false);
-        this.updateCostUsedAmount(costApply.getId());
     }
 
 

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -554,7 +554,7 @@ public class VtbVerificationController {
 //    }
 
     /**
-     * 成功提交回调
+     * 用于根据核销id修复活动数据
      * @param verificationId
      * @return
      */

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -1292,6 +1292,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         log.info("活动核销提交成功。verificationId：{}",verificationId);
         VtbVerification verification = this.getById(verificationId);
         if(verification.getVerificationState()>1){
+            log.warn("活动核销已提交成功，请勿重复提交。verificationId：{}",verificationId);
             return;
         }
         boolean checkZero = verification.getAmount().compareTo(BigDecimal.ZERO)==0;
@@ -1324,7 +1325,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         Map<Long,List<TbsActivityCenter>> centerMapBySubject = activityCenterList.stream()
                 .collect(Collectors.groupingBy(TbsActivityCenter::getSubjectId));
         List<VtbFundFlow> addFundFlowList = new ArrayList<>();
-        LocalDateTime now = LocalDateTime.now();
 
         for (VtbVerificationSubject verificationSubject : verificationSubjects) {
             Long subjectId = verificationSubject.getSubjectId();
@@ -1387,8 +1387,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
         }
 
-
-
         fundFlowService.saveBatch(addFundFlowList);
         //fundFlow绑定考核期项，用于合计预算使用情况
         LambdaQueryWrapper<VtbVerificationSubject> subjectLqw = new LambdaQueryWrapper<>();