1、vip课线上转线下

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2085,7 +2085,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(Objects.nonNull(classGroupTeacherSalary)){
 				teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?classGroupTeacherSalary.getSalary():classGroupTeacherSalary.getOnlineClassesSalary();
 			}
-			if(teacherSalary.compareTo(BigDecimal.ZERO)<=0){
+			if(Objects.isNull(teacherSalary)||teacherSalary.compareTo(BigDecimal.ZERO)<=0){
 				TeacherDefaultVipGroupSalary tdvs = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(courseSchedules.get(0).getActualTeacherId(),vipGroup.getVipGroupCategoryId());
 				if (tdvs == null||Objects.isNull(tdvs.getOfflineClassesSalary())) {
 					throw new BizException("老师[]没有设置默认课酬，请先设置", courseSchedules.get(0).getActualTeacherId());
@@ -2707,7 +2707,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						if(Objects.nonNull(classGroupTeacherSalary)){
 							teacherSalary=newCourseSchedule.getTeachMode() == TeachModeEnum.OFFLINE?classGroupTeacherSalary.getSalary():classGroupTeacherSalary.getOnlineClassesSalary();
 						}
-						if(teacherSalary.compareTo(BigDecimal.ZERO)<=0){
+						if(Objects.isNull(teacherSalary)||teacherSalary.compareTo(BigDecimal.ZERO)<=0){
 							TeacherDefaultVipGroupSalary tdvs = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(teacherId,vipGroup.getVipGroupCategoryId());
 							if (tdvs == null||Objects.isNull(tdvs.getOfflineClassesSalary())) {
 								throw new BizException("老师[]没有设置默认课酬，请先设置", teacherId);
@@ -2715,7 +2715,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							teacherSalary=tdvs.getOfflineClassesSalary();
 						}
 
-						courseScheduleTeacherSalaryDao.batchUpdateCourseSalarys(courseScheduleIds, teacherSalary);
+						ts.setExpectSalary(teacherSalary);
 
 					} else if (newCourseSchedule.getGroupType() == PRACTICE) {
 						List<TeacherDefaultPracticeGroupSalary> teacherDefaultPracticeGroupSalaryList = teacherDefaultPracticeGroupSalaryDao