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 { */ 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 subjectCenterList = verificationSubjectCenterService.listEffectiveByActivityId(activityId); boolean centerCommitFlag = subjectCenterList.size()>0; @@ -159,6 +164,9 @@ public class VtbFundFlowServiceImpl extends ServiceImpl