소스 검색

1、添加教务老师字段
2、布置作业

Joburgess 5 년 전
부모
커밋
8c90f02182
1개의 변경된 파일8개의 추가작업 그리고 0개의 파일을 삭제
  1. 8 0
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -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());