|
@@ -923,7 +923,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
//统计乐团还在审核中或者审核被拒的缴费
|
|
//统计乐团还在审核中或者审核被拒的缴费
|
|
|
int count = musicGroupPaymentCalenderDao.countAuditReject(calender.getMusicGroupId(), calender.getId());
|
|
int count = musicGroupPaymentCalenderDao.countAuditReject(calender.getMusicGroupId(), calender.getId());
|
|
|
if (count == 0) {
|
|
if (count == 0) {
|
|
|
- musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
|
|
|
|
|
|
|
+ musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
|
|
|
musicGroup.setUpdateTime(date);
|
|
musicGroup.setUpdateTime(date);
|
|
|
musicGroupDao.update(musicGroup);
|
|
musicGroupDao.update(musicGroup);
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
@@ -931,7 +931,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
throw new BizException("请重新登录");
|
|
throw new BizException("请重新登录");
|
|
|
}
|
|
}
|
|
|
//记录操作日志
|
|
//记录操作日志
|
|
|
- musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目通过（费用审核中 -> 报名中）", sysUser.getId(), ""));
|
|
|
|
|
|
|
+ musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目通过（费用审核中 -> 预报名）", sysUser.getId(), ""));
|
|
|
}
|
|
}
|
|
|
} else if (calender.getPaymentType() == ADD_STUDENT) {
|
|
} else if (calender.getPaymentType() == ADD_STUDENT) {
|
|
|
// 学生加到班级
|
|
// 学生加到班级
|
zouxuan