|
@@ -259,7 +259,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
errStudentIds.add(Integer.valueOf(studentIdStr));
|
|
errStudentIds.add(Integer.valueOf(studentIdStr));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if(errStudentIds.size()>0){
|
|
|
|
|
|
|
+ if(errStudentIds.size() > 0){
|
|
|
List<SimpleUserDto> students = teacherDao.getUsersSimpleInfo(errStudentIds);
|
|
List<SimpleUserDto> students = teacherDao.getUsersSimpleInfo(errStudentIds);
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
String studentNames = StringUtils.join(students.stream().map(SimpleUserDto::getNickName).collect(Collectors.toList()), "、");
|
|
String studentNames = StringUtils.join(students.stream().map(SimpleUserDto::getNickName).collect(Collectors.toList()), "、");
|
|
@@ -2586,7 +2586,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
VipGroup vipGroupApplyBaseInfoDto = vipGroupDao.get(vipGroupId);
|
|
VipGroup vipGroupApplyBaseInfoDto = vipGroupDao.get(vipGroupId);
|
|
|
List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroupApplyBaseInfoDto.getCourseSchedulesJson(),CourseSchedule.class);
|
|
List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroupApplyBaseInfoDto.getCourseSchedulesJson(),CourseSchedule.class);
|
|
|
int courseNum = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue(),"VIP");
|
|
int courseNum = courseScheduleDao.countVipGroupCourses(vipGroupId.intValue(),"VIP");
|
|
|
- if(courseNum==0){
|
|
|
|
|
|
|
+ if(courseNum == 0){
|
|
|
courseScheduleService.batchAddCourseSchedule(courseSchedules);
|
|
courseScheduleService.batchAddCourseSchedule(courseSchedules);
|
|
|
|
|
|
|
|
ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupApplyBaseInfoDto.getUserId());
|
|
ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupApplyBaseInfoDto.getUserId());
|
zouxuan