Browse Source

fix: 批量核销的0元核销申请金额释放修复

checkBack
Yen 12 months ago
parent
commit
4f519ec0f8
  1. 2
      src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
  2. 15
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

2
src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java

@ -47,7 +47,7 @@ public class BazVisitInstanceController {
public R<PageVo<BazVisitInstance>> getPage(BazVisitInstanceSo param){ public R<PageVo<BazVisitInstance>> getPage(BazVisitInstanceSo param){
BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance()); BazVisitInstance query = CopierUtil.copy(param,new BazVisitInstance());
if(param.getQueryStartDate()!=null){ if(param.getQueryStartDate()!=null){
query.setQueryEndDate(param.getQueryStartDate().atStartOfDay()); query.setQueryStartDate(param.getQueryStartDate().atStartOfDay());
} }
if(param.getQueryEndDate()!=null){ if(param.getQueryEndDate()!=null){
query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59)); query.setQueryEndDate(param.getQueryEndDate().atTime(23,59,59));

15
src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@ -1356,6 +1356,21 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
verification.setVerificationState(VtbVerificationState.Finished.getCode()); verification.setVerificationState(VtbVerificationState.Finished.getCode());
verification.setFinishedTime(LocalDateTime.now()); verification.setFinishedTime(LocalDateTime.now());
super.updateById(verification); super.updateById(verification);
//更新释放的核销(单个核销外层有释放,批量没有在这里补充)
if(verification.getBatchId()!=null
&&verification.getRegReleaseFlag()!=null
&&verification.getRegReleaseFlag().equals(1)){
//更新活动状态
SysUser sysUser = sysUserService.getById(verification.getRegReleaseUserId());
if(sysUser==null){
sysUser = new SysUser();
sysUser.setCode("0");
sysUser.setName("系统执行");
}
this.release(verification.getActivityId(),sysUser.getCode(),true,false);
}
return; return;
} }
TbsActivity activity = activityService.getById(verification.getActivityId()); TbsActivity activity = activityService.getById(verification.getActivityId());

Loading…
Cancel
Save