Joburgess 5 лет назад
Родитель
Сommit
74f44fbf8d

+ 13 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -579,6 +579,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             TeacherDefaultVipGroupSalary teacherDefaultVipGroupSalary = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(vipGroup.getUserId(),
                     vipGroup.getVipGroupCategoryId());
             VipGroupCategory vipGroupCategory = vipGroupCategoryDao.get(vipGroup.getVipGroupCategoryId().intValue());
+            if(Objects.isNull(teacherDefaultVipGroupSalary)){
+                throw new BizException("请设置课酬");
+            }
             onlineTeacherSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary();
             offlineTeacherSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary();
             oldStudentNum = vipGroupCategory.getStudentNum();
@@ -601,12 +604,16 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         BigDecimal studentNumDecimal = new BigDecimal(studentNum);
         BigDecimal oldStudentNumDecimal = new BigDecimal(oldStudentNum);
 
-        onlineTeacherSalary = onlineTeacherSalary
-                .divide(oldStudentNumDecimal, CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN)
-                .multiply(studentNumDecimal).setScale(0,BigDecimal.ROUND_HALF_UP);
-        offlineTeacherSalary = offlineTeacherSalary
-                .divide(oldStudentNumDecimal,CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN)
-                .multiply(studentNumDecimal).setScale(0,BigDecimal.ROUND_HALF_UP);
+        if(Objects.nonNull(onlineTeacherSalary)){
+            onlineTeacherSalary = onlineTeacherSalary
+                    .divide(oldStudentNumDecimal, CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN)
+                    .multiply(studentNumDecimal).setScale(0,BigDecimal.ROUND_HALF_UP);
+        }
+        if(Objects.nonNull(offlineTeacherSalary)){
+            offlineTeacherSalary = offlineTeacherSalary
+                    .divide(oldStudentNumDecimal,CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN)
+                    .multiply(studentNumDecimal).setScale(0,BigDecimal.ROUND_HALF_UP);
+        }
 
         classGroupTeacherSalary.setOnlineClassesSalary(onlineTeacherSalary);
         classGroupTeacherSalary.setSalary(offlineTeacherSalary);