fix: 合并核销状态调整

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java

@@ -40,7 +40,11 @@ public interface VtbVerificationService extends IService<VtbVerification> {
      * @return
      */
     boolean removeCheck(Long id);
-
+    /**
+     * 释放活动费用
+     * @param activityId
+     */
+    void release(Long activityId,String userCode,Boolean throwEx,boolean checkState);
     /**
      * 释放活动费用
      * @param activityId

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

@@ -76,7 +76,8 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification
             vtbVerificationService.updateById(verification);
         }
         Set<Long> actIdList = verificationList.stream().map(VtbVerification::getActivityId).collect(Collectors.toSet());
-        List<TbsActivity> activityList = tbsActivityMapper.selectList(new LambdaQueryWrapper<TbsActivity>().eq(TbsActivity::getId,actIdList));
+        List<TbsActivity> activityList = tbsActivityMapper.selectList(new LambdaQueryWrapper<TbsActivity>()
+                .in(TbsActivity::getId,actIdList));
         for (TbsActivity activity : activityList) {
             TbsActivity activity1 = new TbsActivity();
             activity1.setId(activity.getId());
@@ -116,9 +117,11 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification
         batch.setVtbBatchStatus(VtbVerificationBatch.BatchState.CHECK_REFUSE);
         batch.setRefuseTime(LocalDateTime.now());
         vtbVerificationBatchService.updateById(batch);
+        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         for (VtbVerification verification : verificationList) {
             verification.setVerificationState(VtbVerificationState.Stop.getCode());
             vtbVerificationService.updateById(verification);
+            vtbVerificationService.release(verification.getActivityId(),sysUser.getCode(),true,false);
         }
         return null;
     }

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

@@ -115,9 +115,11 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl<VtbVerification
             baseMapper.updateBackedItemToClose(submitBo.getBatchId());
         }
 
+        List<Long> actIds = submitBo.getVerificationList().stream().map(VtbVerificationBo::getActivityId).collect(Collectors.toList());
         LambdaQueryWrapper<VtbVerification> vtbVerificationLQW = new LambdaQueryWrapper<>();
         vtbVerificationLQW.eq(VtbVerification::getCostApplyId,costApply.getId());
         vtbVerificationLQW.eq(VtbVerification::getVerificationState, VtbVerificationState.Commiting);
+        vtbVerificationLQW.in(VtbVerification::getActivityId,actIds);
         long count = vtbVerificationService.count(vtbVerificationLQW);
         if(count>0){
             Assert.throwEx("部分活动正在核销中");

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

@@ -479,6 +479,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     }
 
 
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void release(Long activityId,String userCode,Boolean throwEx,boolean checkState) {
         String url = "unknown";