update

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

@@ -60,19 +60,19 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 			TeacherDefaultMusicGroupSalary salary = salaries.get(0);
 			Integer userId = salary.getUserId();
 			// 获取老师默认乐团课课酬
-			List<TeacherDefaultMusicGroupSalary> origSalaryList = teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, null);
+			/*List<TeacherDefaultMusicGroupSalary> origSalaryList = teacherDefaultMusicGroupSalaryDao.getTeacherSalaryByUserIdAndType(userId, null);
 
 			Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> map = new HashMap<CourseScheduleType, TeacherDefaultMusicGroupSalary>();
 			if (origSalaryList != null && origSalaryList.size() > 0) {
 				for (TeacherDefaultMusicGroupSalary ms : origSalaryList) {
 					map.put(ms.getCourseScheduleType(), ms);
 				}
-			}
+			}*/
 
 			Map<CourseScheduleType, TeacherDefaultMusicGroupSalary> salaryMap = new HashMap<CourseScheduleType, TeacherDefaultMusicGroupSalary>();
 			for (TeacherDefaultMusicGroupSalary ms : salaries) {
 				// 修改了哪些课酬
-				TeacherDefaultMusicGroupSalary oldMS = map.get(ms.getCourseScheduleType());
+				/*TeacherDefaultMusicGroupSalary oldMS = map.get(ms.getCourseScheduleType());
 
 				if (oldMS == null || oldMS.getAssistantTeacher30MinSalary() == null || oldMS.getMainTeacher30MinSalary() == null
 						|| oldMS.getAssistantTeacher90MinSalary() == null || oldMS.getMainTeacher90MinSalary() == null
@@ -81,8 +81,8 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 						|| oldMS.getAssistantTeacher90MinSalary().doubleValue() != ms.getAssistantTeacher90MinSalary().doubleValue()
 						|| oldMS.getMainTeacher90MinSalary().doubleValue() != ms.getMainTeacher90MinSalary().doubleValue()) {
 					salaryMap.put(ms.getCourseScheduleType(), ms);
-				}
-
+				}*/
+				salaryMap.put(ms.getCourseScheduleType(), ms);
 			}
 
 			if (salaryMap.size() > 0) {

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

@@ -70,26 +70,26 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 			TeacherDefaultVipGroupSalary salary = teacherDefaultVipGroupSalaries.get(0);
 			Integer userId = salary.getUserId();
 			// 获取老师默认VIP课课酬
-			List<TeacherDefaultVipGroupSalary> origSalaryList = teacherDefaultVipGroupSalaryDao.queryByUserId(userId);
+			/*List<TeacherDefaultVipGroupSalary> origSalaryList = teacherDefaultVipGroupSalaryDao.queryByUserId(userId);
 
 			Map<Integer, TeacherDefaultVipGroupSalary> map = new HashMap<Integer, TeacherDefaultVipGroupSalary>();
 			if (origSalaryList != null && origSalaryList.size() > 0) {
 				for (TeacherDefaultVipGroupSalary ms : origSalaryList) {
 					map.put(ms.getVipGroupCategoryId(), ms);
 				}
-			}
+			}*/
 
 			Map<Integer, TeacherDefaultVipGroupSalary> salaryMap = new HashMap<Integer, TeacherDefaultVipGroupSalary>();
 			for (TeacherDefaultVipGroupSalary ms : teacherDefaultVipGroupSalaries) {
 				// 修改了哪些课酬
-				TeacherDefaultVipGroupSalary oldMS = map.get(ms.getVipGroupCategoryId());
+				/*TeacherDefaultVipGroupSalary oldMS = map.get(ms.getVipGroupCategoryId());
 
 				if (oldMS == null || oldMS.getOfflineClassesSalary() == null
 						|| oldMS.getOfflineClassesSalary().doubleValue() != ms.getOfflineClassesSalary().doubleValue()
 						|| oldMS.getOnlineClassesSalary() == null || oldMS.getOnlineClassesSalary().doubleValue() != ms.getOnlineClassesSalary().doubleValue()) {
 					salaryMap.put(ms.getVipGroupCategoryId(), ms);
-				}
-
+				}*/
+				salaryMap.put(ms.getVipGroupCategoryId(), ms);
 			}
 
 			if (salaryMap.size() > 0) {