Merge remote-tracking branch 'origin/master'

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

@@ -1836,11 +1836,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							// 乐团结算方式
 							String settlementType = musicGroupSettlementsMap.get(courseScheduleId);
 							int unitMinutes = 30;
-							if (newCourseSchedule.getType() == CourseScheduleType.CLASSROOM) {
-								unitMinutes = 40;
-							} else if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
-								unitMinutes = 45;
-							}
 
 							// 如果当前教师是在指定日期之后入职的，则按照3.0的方式结算
 							Teacher teacher = teacherMap.get(teacherId);
@@ -1849,12 +1844,23 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 								settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY.getCode();
 							}
 							if (StringUtils.equals(settlementType, "TEACHER_DEFAULT")) {
+								if (newCourseSchedule.getType() == CourseScheduleType.CLASSROOM) {
+									unitMinutes = 40;
+								} else if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
+									unitMinutes = 45;
+								}
 								if (ts.getTeacherRole() == TeachTypeEnum.BISHOP) {
 									ts.setExpectSalary(new BigDecimal(tdms.getMainTeacher30MinSalary().doubleValue() * newMinutes / unitMinutes));
 								} else {
 									ts.setExpectSalary(new BigDecimal(tdms.getAssistantTeacher30MinSalary().doubleValue() * newMinutes / unitMinutes));
 								}
 							} else if (StringUtils.equals(settlementType, "GRADIENT_SALARY")) {
+								unitMinutes = 90;
+								if (newCourseSchedule.getType() == CourseScheduleType.CLASSROOM) {
+									unitMinutes = 40;
+								} else if (newCourseSchedule.getType() == CourseScheduleType.HIGH) {
+									unitMinutes = 45;
+								}
 								if (ts.getTeacherRole() == TeachTypeEnum.BISHOP) {
 									ts.setExpectSalary(new BigDecimal(tdms.getMainTeacher90MinSalary().doubleValue() * newMinutes / unitMinutes));
 								} else {