From 2c74dfa407ab674e140d0517f624753935eaeb41 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 15 Jul 2024 14:49:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/vtb/service/VtbVerificationService.java   | 6 +++++-
 .../impl/VtbVerificationBatchOperationServiceImpl.java      | 5 ++++-
 .../vtb/service/impl/VtbVerificationBatchServiceImpl.java   | 2 ++
 .../vtb/service/impl/VtbVerificationServiceImpl.java        | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
index ab8435a0..1ac5c36c 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
+++ b/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
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
index d176226a..b40b7379 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
+++ b/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;
     }
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
index 86e4be57..5c6d6782 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
+++ b/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("部分活动正在核销中");
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index b435417f..bcd0ad0c 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/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";