|
@@ -1023,8 +1023,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
if (calenders.size() == 0) {
|
|
|
throw new BizException("缴费批次不存在");
|
|
|
}
|
|
|
-// SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
-// Date date = new Date();
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
+ Date date = new Date();
|
|
|
calenders.forEach(e -> {
|
|
|
if (e.getPaymentType() == ADD_STUDENT) {
|
|
|
throw new BizException("{} 的缴费项目不允许撤回", e.getStatus().getDesc());
|
|
@@ -1032,15 +1032,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
if (e.getStatus() != AUDITING) {
|
|
|
throw new BizException("{} 的缴费状态不允许撤回", e.getStatus().getDesc());
|
|
|
}
|
|
|
-/* if (e.getPaymentType() == MUSIC_APPLY) {
|
|
|
+ if (e.getPaymentType() == MUSIC_APPLY) {
|
|
|
//如果是报名,并且所有的报名都审核通过,需要修改乐团状态
|
|
|
MusicGroup musicGroup = musicGroupDao.get(e.getMusicGroupId());
|
|
|
- musicGroup.setStatus(MusicGroupStatusEnum.PRE_BUILD_FEE);
|
|
|
+ musicGroup.setStatus(MusicGroupStatusEnum.DRAFT);
|
|
|
musicGroup.setUpdateTime(date);
|
|
|
musicGroupDao.update(musicGroup);
|
|
|
//记录操作日志
|
|
|
- musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目撤回(费用审核中 -> 撤回)", sysUser.getId(), ""));
|
|
|
- }*/
|
|
|
+ musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目撤回(费用审核中 -> 草稿)", sysUser.getId(), ""));
|
|
|
+ }
|
|
|
e.setStatus(DRAFT);
|
|
|
});
|
|
|
musicGroupPaymentCalenderDao.batchUpdate(calenders);
|