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 872bea7d..084d2b78 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 @@ -1170,14 +1170,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl0; //0元核销只改变状态 if(checkZero){ - //自定义成本中心提交后,无法再自动分配刷新金额 - if(isCenterCommit){ - //TODO 刷洗自定义金额 - - }else { - //自动分配刷新金额 - fundFlowService.flushActivityAmount(verification.getActivityId()); - } + //自动分配刷新金额(旧流程按比例分配,新流程按比例分配后,进行再分配) + fundFlowService.flushActivityAmount(verification.getActivityId()); verification = new VtbVerification(); verification.setId(verificationId); verification.setVerificationState(VtbVerificationState.Finished.getCode()); @@ -1296,7 +1290,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectLqw = new LambdaQueryWrapper<>(); @@ -1304,7 +1298,20 @@ public class VtbVerificationServiceImpl extends ServiceImpl subjectCenterLqw = new LambdaQueryWrapper<>(); + subjectCenterLqw.eq(VtbVerificationSubjectCenter::getVerificationId,verificationId); + VtbVerificationSubjectCenter centerUpdParam = new VtbVerificationSubjectCenter(); + centerUpdParam.setEffectiveFlag(1); + vtbVerificationSubjectCenterService.update(centerUpdParam,subjectCenterLqw); + //更新活动状态 + TbsActivity activityUpdate = new TbsActivity(); + activityUpdate.setVtbMatchTypeFlag(1); + activityUpdate.setId(verification.getActivityId()); + activityService.updateById(activityUpdate); + } + BigDecimal totalCostApplyUsed = costApply.getTotalActivityUsedAmount().add(verification.getAmount()); TbsCostApply updCost = new TbsCostApply();