Browse Source

fix:修复单个核销金额释放异常

checkBack
Yen 1 year ago
parent
commit
89a5f3716b
  1. 16
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
  2. 10
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

16
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@ -370,6 +370,22 @@ public class TbsActivityController {
return R.ok(); return R.ok();
} }
/**
* 释放活动费用
* @param id
* @return
*/
@PostMapping("/release2/{id}")
@SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:activity:release')")
public R<?> release2(@PathVariable("id") Long id){
SysUser sysUser = new SysUser();
sysUser.setName("系统执行");
sysUser.setCode("0");
verificationService.release(id,sysUser.getCode(),false);
return R.ok();
}
/** /**
* 释放活动费用 * 释放活动费用
* @return * @return

10
src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@ -82,6 +82,16 @@ public class VtbVerificationApplication {
//临时测试 //临时测试
boolean devFlag = false; boolean devFlag = false;
VtbVerification verification = vtbVerificationService.getById(affairCommit.getCostApplyId()); VtbVerification verification = vtbVerificationService.getById(affairCommit.getCostApplyId());
//更新释放标识
if(affairCommit.getReleaseFlag()!=null){
VtbVerification vtbVer = new VtbVerification();
vtbVer.setId(verification.getId());
vtbVer.setRegReleaseFlag(affairCommit.getReleaseFlag());
vtbVer.setRegReleaseUserId(AuthContextUtils.getSysUserId());
vtbVerificationService.updateById(vtbVer);
//完成时会调用更新
verification.setRegReleaseFlag(affairCommit.getReleaseFlag());
}
if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){
VtbVerificationOperationServiceImpl optSvc = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); VtbVerificationOperationServiceImpl optSvc = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
optSvc.runCompensate(verification.getId()+""); optSvc.runCompensate(verification.getId()+"");

Loading…
Cancel
Save