|
@@ -303,7 +303,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
if(StringUtils.isNotBlank(studentIds)){
|
|
|
List<Integer> collect = studentIdList.stream().mapToInt(Integer::parseInt).boxed().collect(Collectors.toList());
|
|
|
classGroupService.addStudentIntoClassGroup(vipGroupApplyBaseInfoDto.getId().toString(),classGroup.getId(),collect);
|
|
|
- createVipGroupCourseScheInfo(vipGroupApplyBaseInfoDto.getId());
|
|
|
+ createVipGroupCourseScheInfo(vipGroupApplyBaseInfoDto.getId(),classGroup);
|
|
|
}
|
|
|
|
|
|
Set<Integer> roleIds = new HashSet<>(1);
|
|
@@ -835,11 +835,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
}
|
|
|
|
|
|
Integer studentPaymentNum=studentPaymentOrderDao.countStudentPaymentNum(vipGroupId.toString());
|
|
|
+
|
|
|
if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
|
|
|
+ classGroup.setStudentNum(studentPaymentNum);
|
|
|
classGroup.setDelFlag(YesOrNoEnum.NO);
|
|
|
vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
|
|
|
vipGroupDao.update(vipGroup);
|
|
|
- createVipGroupCourseScheInfo(vipGroupId);
|
|
|
+ createVipGroupCourseScheInfo(vipGroupId,classGroup);
|
|
|
}
|
|
|
if(num!=0||updateVipStatus){
|
|
|
classGroupDao.update(classGroup);
|
|
@@ -848,15 +850,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public void createVipGroupCourseScheInfo(Long vipGroupId){
|
|
|
+ public void createVipGroupCourseScheInfo(Long vipGroupId,ClassGroup classGroup){
|
|
|
VipGroup vipGroupApplyBaseInfoDto = vipGroupDao.get(vipGroupId);
|
|
|
List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroupApplyBaseInfoDto.getCourseSchedulesJson(),CourseSchedule.class);
|
|
|
courseScheduleService.batchAddCourseSchedule(courseSchedules);
|
|
|
|
|
|
SysUser sysUser = sysUserFeignService.queryUserById(vipGroupApplyBaseInfoDto.getUserId());
|
|
|
|
|
|
- ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId,null);
|
|
|
-
|
|
|
ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupApplyBaseInfoDto.getUserId());
|
|
|
|
|
|
//创建老师单节课课酬信息
|