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 c33fa997..a7d65424 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 @@ -98,7 +98,7 @@ public class VtbVerificationApplication { VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); if(devFlag){ - summeryResult = "next"; + summeryResult = "finished"; } R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult); try { @@ -422,6 +422,7 @@ public class VtbVerificationApplication { vtbVer.setFinishedTime(LocalDateTime.now()); vtbVer.setRegReleaseFlag(verification.getRegReleaseFlag()); vtbVerificationService.updateById(vtbVer); + //刷新本次核销数据 vtbVerificationService.successCommit(verification.getId()); LambdaQueryWrapper countOLqw = new LambdaQueryWrapper<>(); 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 71aafc2b..ef867a3e 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 @@ -198,6 +198,7 @@ public class VtbFundFlowServiceImpl extends ServiceImpl subjectLqw = new LambdaQueryWrapper<>(); subjectLqw.eq(VtbVerificationSubject::getVerificationId,verificationId); VtbVerificationSubject subjectParam = new VtbVerificationSubject(); subjectParam.setEffectiveFlag(1); + //更新已用费用记录,并更新活动状态是否完成(旧流程按比例分配,新流程按比例分配后,进行再分配) + fundFlowService.flushActivityAmount(verification.getActivityId()); verificationSubjectService.update(subjectParam,subjectLqw); //更新成本中心维度 if(isCenterCommit){