Merge branch 'master' into Joburgess

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1937,14 +1937,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     salary = baseSalary.multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
 
-                    for (CourseScheduleTeacherSalary teacherSalary : allTeacherSalarys) {
-                        if (teacherSalary.getUserId().equals(classGroupTeacherMapper.getUserId())
-                                && teacherSalary.getTeacherRole().equals(classGroupTeacherMapper.getTeacherRole())) {
-                            int duration = DateUtil.minutesBetween(teacherSalary.getCourseSchedule().getStartClassTime(), teacherSalary.getCourseSchedule().getEndClassTime());
-                            salary = teacherSalary.getExpectSalary().divide(new BigDecimal(duration), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(classCourseDuration)).setScale(2, BigDecimal.ROUND_HALF_UP);
-                            break;
-                        }
-                    }
+//                    for (CourseScheduleTeacherSalary teacherSalary : allTeacherSalarys) {
+//                        if (teacherSalary.getUserId().equals(classGroupTeacherMapper.getUserId())
+//                                && teacherSalary.getTeacherRole().equals(classGroupTeacherMapper.getTeacherRole())) {
+//                            int duration = DateUtil.minutesBetween(teacherSalary.getCourseSchedule().getStartClassTime(), teacherSalary.getCourseSchedule().getEndClassTime());
+//                            salary = teacherSalary.getExpectSalary().divide(new BigDecimal(duration), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(classCourseDuration)).setScale(2, BigDecimal.ROUND_HALF_UP);
+//                            break;
+//                        }
+//                    }
 
                     //课堂课课酬
                     if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.CLASSROOM)) {