From bb0928c88c1078ced4a9fd04c40ad46626c0bb78 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 12 Jul 2024 11:30:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/modules/vtb/service/VtbFundFlowService.java  | 1 +
 .../modules/vtb/service/VtbVerificationApplication.java   | 2 +-
 .../modules/vtb/service/impl/VtbFundFlowServiceImpl.java  | 8 ++++++++
 .../vtb/service/impl/VtbVerificationServiceImpl.java      | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java
index b915fc7c..140d97a3 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbFundFlowService.java
@@ -44,5 +44,6 @@ public interface VtbFundFlowService extends IService<VtbFundFlow> {
      */
     void flushActivityAmount(Long activityId);
 
+    void flushActivityAmount(Long activityId,Integer releaseFlag);
 }
 
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 526f8584..0cb4052c 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
@@ -458,7 +458,7 @@ public class VtbVerificationApplication {
         activity4Upd.setUsedAmount(totalUsed);
         if(totalUsed.compareTo(activity.getTotalAmount())>=0){
             activity4Upd.setActivityState(TbsActivityState.STATE_1_Finished);
-        }else if (activity.getReleaseFlag().equals(1)){
+        }else if (verification.getRegReleaseFlag().equals(1)){
             activity4Upd.setActivityState(TbsActivityState.STATE_4_Release);
         }else {
             activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo);
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
index 4416ed47..08935fe3 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
@@ -84,6 +84,11 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
 
     @Override
     public void flushActivityAmount(Long activityId) {
+        this.flushActivityAmount(activityId,null);
+    }
+
+    @Override
+    public void flushActivityAmount(Long activityId,Integer releaseFlag){
         //活动自定义提交记录
         List<VtbVerificationSubjectCenter> subjectCenterList = verificationSubjectCenterService.listEffectiveByActivityId(activityId);
         boolean centerCommitFlag = subjectCenterList.size()>0;
@@ -159,6 +164,9 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
         }else {
             //判断是否协议类
             activity.setActivityState(TbsActivityState.STATE_0_Todo);
+            if(releaseFlag!=null&&releaseFlag.equals(1)){
+                activity.setActivityState(TbsActivityState.STATE_4_Release);
+            }
             TbsCostApply costApply = costApplyMapper.selectById(orgActivity.getCostApplyId());
             if(costApply!=null){
                 if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
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 f19365c0..0f3869da 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
@@ -1432,7 +1432,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         subjectParam.setEffectiveFlag(1);
         //fundFlowService.flushActivityAmount() 必须把FundFlow操作前置
         //更新已用费用记录，并更新活动状态是否完成（旧流程按比例分配，新流程按比例分配后，进行再分配）
-        fundFlowService.flushActivityAmount(verification.getActivityId());
+        fundFlowService.flushActivityAmount(verification.getActivityId(),verification.getRegReleaseFlag());
         verificationSubjectService.update(subjectParam,subjectLqw);
         //更新成本中心维度
         if(isCenterCommit){