|
@@ -671,11 +671,19 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
classGroupTeacherSalaryDao.insert(newClassGroupTeacherSalary);
|
|
|
}
|
|
|
|
|
|
+ TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(), vipGroup.getVipGroupCategoryId());
|
|
|
+
|
|
|
BigDecimal onlineTeacherSalary,
|
|
|
offlineTeacherSalary;
|
|
|
|
|
|
onlineTeacherSalary=classGroupTeacherSalary.getOnlineClassesSalary();
|
|
|
+ if(Objects.isNull(onlineTeacherSalary)){
|
|
|
+ onlineTeacherSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
|
|
|
+ }
|
|
|
offlineTeacherSalary=classGroupTeacherSalary.getSalary();
|
|
|
+ if(Objects.isNull(offlineTeacherSalary)){
|
|
|
+ offlineTeacherSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
|
|
|
+ }
|
|
|
|
|
|
VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
|
|
|
|