|
@@ -2154,7 +2154,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
VipGroup vipGroup=null;
|
|
VipGroup vipGroup=null;
|
|
VipGroupActivity vipGroupActivity = null;
|
|
VipGroupActivity vipGroupActivity = null;
|
|
|
|
|
|
- if(groupType == VIP) {
|
|
|
|
|
|
+ if(groupType == VIP || groupType == LIVE) {
|
|
vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
|
|
vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
|
|
if(Objects.isNull(vipGroup)){
|
|
if(Objects.isNull(vipGroup)){
|
|
throw new BizException("课程组信息不存在");
|
|
throw new BizException("课程组信息不存在");
|
|
@@ -2334,7 +2334,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(groupType == VIP){
|
|
|
|
|
|
+ if(groupType == VIP || groupType == LIVE){
|
|
CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
|
|
CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
|
|
//
|
|
//
|
|
// BigDecimal teacherSalary=BigDecimal.ZERO;
|
|
// BigDecimal teacherSalary=BigDecimal.ZERO;
|