Forráskód Böngészése

1、去掉vip课无教学点不能进行课程调整的限制

Joburgess 5 éve
szülő
commit
84d0be184c

+ 4 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -69,8 +69,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                                                      BigDecimal offlineTeacherSalary) {
 
         School school = schoolService.get(vipGroup.getTeacherSchoolId());
-        if (Objects.isNull(school)) {
-            throw new BizException("未找到该教学点");
+        BigDecimal subsidy = new BigDecimal(0);
+        if (Objects.nonNull(school)) {
+            subsidy=school.getSubsidy();
         }
 
         //获取活动信息
@@ -95,7 +96,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
                 courseScheduleTeacherSalary.setUserId(courseSchedules.get(i).getActualTeacherId().intValue());
                 courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
-                courseScheduleTeacherSalary.setSubsidy(school.getSubsidy());
+                courseScheduleTeacherSalary.setSubsidy(subsidy);
 
                 if (vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
                         && vipGroup.getGiveTeachMode() == teachModeEnum