|
|
@@ -2345,8 +2345,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
this.checkLiveAdjust(courseSchedules);
|
|
|
//校验机构线上课人数上限
|
|
|
this.checkOnlineCategory(courseSchedules,vipGroupCourseAdjustInfo.getTeachMode());
|
|
|
- //重置连堂课标记
|
|
|
- this.resetLiveRemind(courseSchedules);
|
|
|
//拷贝历史直播课
|
|
|
List<CourseSchedule> liveCourseSchedules = Lists.newArrayList(courseSchedules);
|
|
|
courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
|
@@ -2484,24 +2482,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
if(groupType == VIP || groupType == LIVE){
|
|
|
CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
|
|
|
-//
|
|
|
-// BigDecimal teacherSalary=BigDecimal.ZERO;
|
|
|
-
|
|
|
-// Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getUserId());
|
|
|
-//
|
|
|
-// ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupCourseAdjustInfo.getVipGroupId().intValue(), courseSchedules.get(0).getActualTeacherId());
|
|
|
-//
|
|
|
-// if(Objects.nonNull(classGroupTeacherSalary)){
|
|
|
-// teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary");
|
|
|
-// }
|
|
|
-
|
|
|
if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
|
|
|
vipGroup.setCoursesExpireDate(courseSchedule.getEndClassTime());
|
|
|
vipGroupDao.update(vipGroup);
|
|
|
}
|
|
|
|
|
|
-// courseScheduleTeacherSalaryDao.batchUpdateCourseSalarys(courseScheduleIds, teacherSalary);
|
|
|
-
|
|
|
// 直播课数据清除
|
|
|
for (CourseSchedule item : courseSchedules) {
|
|
|
if (LIVE == item.getGroupType()) {
|
zouxuan