1、乐团课新增排课教师课酬计算逻辑调整

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

@@ -1536,7 +1536,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         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(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
+                            salary=teacherSalary.getExpectSalary().divide(new BigDecimal(duration), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(classCourseDuration)).setScale(2, BigDecimal.ROUND_HALF_UP);
                             break;
                         }
                     }

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

@@ -348,7 +348,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                     if(teacherSalary.getUserId().equals(classGroupTeacherMapper.getUserId())
                             &&teacherSalary.getTeacherRole().equals(classGroupTeacherMapper.getTeacherRole())){
                         int oldDuration=DateUtil.minutesBetween(teacherSalary.getCourseSchedule().getStartClassTime(),teacherSalary.getCourseSchedule().getEndClassTime());
-                        salary=teacherSalary.getExpectSalary().divide(new BigDecimal(oldDuration), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(classTimeDuty).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        salary=teacherSalary.getExpectSalary().divide(new BigDecimal(oldDuration), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(duration)).setScale(2, BigDecimal.ROUND_HALF_UP);
                         break;
                     }
                 }