fix: 修复合并核销状态显示

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);
 }
 

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);

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)){

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){