浏览代码

1、月度课酬显示为0的bug;
2、修复学员管理课表详情未开始课程学员考勤状态

Joburgess 5 年之前
父节点
当前提交
a56e95ea95
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

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

@@ -2085,13 +2085,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if(groupType == VIP){
 			VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 
-			BigDecimal teacherSalary;
+			BigDecimal teacherSalary=BigDecimal.ZERO;
 
 			ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupCourseAdjustInfo.getVipGroupId().intValue(), courseSchedules.get(0).getActualTeacherId());
 
 			if(Objects.nonNull(classGroupTeacherSalary)){
 				teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?classGroupTeacherSalary.getSalary():classGroupTeacherSalary.getOnlineClassesSalary();
-			}else{
+			}
+			if(teacherSalary.compareTo(BigDecimal.ZERO)<=0){
 				TeacherDefaultVipGroupSalary tdvs = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(courseSchedules.get(0).getActualTeacherId(),vipGroup.getVipGroupCategoryId());
 				if (tdvs == null) {
 					throw new BizException("老师[]没有设置默认课酬,请先设置", courseSchedules.get(0).getActualTeacherId());
@@ -2706,13 +2707,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							throw new BizException("课程[{}]记录存在异常,请联系管理员", courseScheduleId);
 						}
 
-						BigDecimal teacherSalary;
+						BigDecimal teacherSalary=BigDecimal.ZERO;
 
 						ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroup.getId().intValue(), teacherId);
 
 						if(Objects.nonNull(classGroupTeacherSalary)){
 							teacherSalary=newCourseSchedule.getTeachMode() == TeachModeEnum.OFFLINE?classGroupTeacherSalary.getSalary():classGroupTeacherSalary.getOnlineClassesSalary();
-						}else{
+						}
+						if(teacherSalary.compareTo(BigDecimal.ZERO)<=0){
 							TeacherDefaultVipGroupSalary tdvs = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(teacherId,vipGroup.getVipGroupCategoryId());
 							if (tdvs == null) {
 								throw new BizException("老师[]没有设置默认课酬,请先设置", teacherId);