|
@@ -79,10 +79,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
//获取活动信息
|
|
|
VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
|
|
|
|
|
|
- if(Objects.isNull(vipGroupActivity)){
|
|
|
- throw new BizException("未找到活动方案");
|
|
|
- }
|
|
|
-
|
|
|
List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();
|
|
|
Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));
|
|
|
|
|
@@ -104,7 +100,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
|
|
|
courseScheduleTeacherSalary.setSubsidy(subsidy);
|
|
|
|
|
|
- if (vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
|
|
|
+ if (Objects.nonNull(vipGroupActivity)
|
|
|
+ &&vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
|
|
|
&& vipGroup.getGiveTeachMode() == teachModeEnum
|
|
|
&& i >= Integer.parseInt(vipGroupActivity.getAttribute1())
|
|
|
&& "0".equals(vipGroupActivity.getGiveClassPaySalaryFlag())) {
|