From 9478e7dd9848fb859d0d475422ae8624f83e4409 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 17 Aug 2023 11:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=AE=A1=E6=89=B9=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B=E6=B7=BB=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3;=E5=AE=A1=E6=89=B9=E9=87=8A?=
 =?UTF-8?q?=E6=94=BE=E9=A2=84=E7=AE=97=E5=BC=82=E5=B8=B8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tbs/controller/TbsActivityController.java      | 2 +-
 .../modules/vtb/service/VtbVerificationApplication.java    | 2 +-
 .../serve/modules/vtb/service/VtbVerificationService.java  | 2 +-
 .../vtb/service/impl/VtbVerificationServiceImpl.java       | 7 ++++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
index 92d1fc68..cb9fe12b 100644
--- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
+++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
@@ -399,7 +399,7 @@ public class TbsActivityController {
     @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE)
     @PreAuthorize("hasRole('tbs:activity:release')")
     public R<?> release(@PathVariable("id") Long id){
-        verificationService.release(id);
+        verificationService.release(id,true);
         return R.ok();
     }
 
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
index e609eb58..6457529f 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
@@ -280,7 +280,7 @@ public class VtbVerificationApplication {
         //释放费用
         boolean isRelease = affairCommit.getReleaseFlag()!=null&&affairCommit.getReleaseFlag().equals(1);
         if( isRelease &&(isFinish||isStop)){
-            this.vtbVerificationService.release(verification.getActivityId());
+            this.vtbVerificationService.release(verification.getActivityId(),false);
         }
         if(isNext){
             //判断是否直接跳过审批的申请
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 5fe8867b..42e81164 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
@@ -33,7 +33,7 @@ public interface VtbVerificationService extends IService<VtbVerification> {
      * 释放活动费用
      * @param activityId
      */
-    void release(Long activityId);
+    void release(Long activityId,Boolean 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 e877a3bf..09d7edf8 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
@@ -158,6 +158,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         activity.setUsedAmount(finalAmt);
         if(finalAmt.compareTo(activity.getTotalAmount())==0) {
             activity.setActivityState(TbsActivityState.STATE_1_Finished);
+            activity.setFinishedFlag(1);
+            activity.setFinishedTime(LocalDateTime.now());
         }
         activityService.updateById(activity);
 
@@ -413,10 +415,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void release(Long activityId) {
+    public void release(Long activityId,Boolean throwEx) {
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         TbsActivity activity = activityService.getById(activityId);
         if(!activity.getActivityState().equals(TbsActivityState.STATE_0_Todo)){
+            if(!throwEx){
+                return;
+            }
             Assert.throwEx("活动状态非待核销状态，操作失败");
         }
         if(activity.getCancelFlag().equals(1)){