update

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

@@ -2941,7 +2941,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     if (teacherIsChange) {
                         TeacherDefaultVipGroupSalary byTeacherAndCategory = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(newCourseSchedule.getActualTeacherId(), byCourseSchedule.getVipGroupCategoryId());
                         if (Objects.nonNull(byTeacherAndCategory)) {
-                            onlineTeacherSalary = byTeacherAndCategory.getOnlineClassesSalary();
+                            onlineTeacherSalary = byTeacherAndCategory.getOfflineClassesSalary();
                             offlineTeacherSalary = byTeacherAndCategory.getOfflineClassesSalary();
                         }
                     } else {

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

@@ -161,9 +161,9 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 										&& vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType() == SalarySettlementTypeEnum.TEACHER_DEFAULT
 										&& (ts.getCourseSchedule().getTeachMode() == TeachModeEnum.ONLINE)) {// 线上课
 									if (teacher.getJobNature() != JobNatureEnum.FULL_TIME
-											&& ts.getExpectSalary().compareTo(origTdms.getOnlineClassesSalary()) == 0
-											&& tdms.getOnlineClassesSalary().compareTo(origTdms.getOnlineClassesSalary()) != 0) {
-										ts.setExpectSalary(tdms.getOnlineClassesSalary());
+											&& ts.getExpectSalary().compareTo(origTdms.getOfflineClassesSalary()) == 0
+											&& tdms.getOfflineClassesSalary().compareTo(origTdms.getOfflineClassesSalary()) != 0) {
+										ts.setExpectSalary(tdms.getOfflineClassesSalary());
 										list.add(ts);
 									}
 								} else if (vipGroupSalarySettlementDto.getOfflineSalarySettlement() != null

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

@@ -944,7 +944,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         BigDecimal teacherOnlineSalary,teacherOfflineSalary,teacherSalary;
         switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
             case TEACHER_DEFAULT:
-                teacherOnlineSalary=teacherDefaultVipGroupSalary.getOnlineClassesSalary().multiply(onlineClassNum);
+                teacherOnlineSalary=teacherDefaultVipGroupSalary.getOfflineClassesSalary().multiply(onlineClassNum);
                 break;
             case RATIO_DISCOUNT:
                 teacherOnlineSalary=vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice().multiply(vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue()).multiply(onlineClassNum);
@@ -1896,7 +1896,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			//创建老师单节课课酬信息
 			courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(vipGroup,
 					newCourseSchedules,
-					teacherDefaultVipGroupSalary.getOnlineClassesSalary(),
+					teacherDefaultVipGroupSalary.getOfflineClassesSalary(),
 					teacherDefaultVipGroupSalary.getOfflineClassesSalary());
 		}
 
@@ -2544,7 +2544,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		if(onlineTeacherSalary.compareTo(zero)<=0){
             if(Objects.nonNull(byTeacherAndCategory)){
-                onlineTeacherSalary=byTeacherAndCategory.getOnlineClassesSalary();
+                onlineTeacherSalary=byTeacherAndCategory.getOfflineClassesSalary();
             }
 		}
 		if(offlineTeacherSalary.compareTo(zero)<=0){
@@ -3062,7 +3062,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				TeacherDefaultVipGroupSalary tdvs = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(ts.getUserId(), ts.getVipGroupCategoryId());
 				if (tdvs != null) {
 					if (ts.getTeachMode() == TeachModeEnum.ONLINE) {
-						ts.setExpectSalary(tdvs.getOnlineClassesSalary());
+						ts.setExpectSalary(tdvs.getOfflineClassesSalary());
 					} else {
 						ts.setExpectSalary(tdvs.getOfflineClassesSalary());
 					}