Merge remote-tracking branch 'origin/master'

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

@@ -638,6 +638,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
         for (CourseSchedule courseSchedule : courseScheduleList) {
             CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+            courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+            courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
             courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
             courseScheduleStudentPayment.setUserId(userId);
             courseScheduleStudentPayment.setExpectPrice(coursePrice);
@@ -1043,6 +1045,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
                     courseScheduleTeacherSalary.setCourseScheduleId(courseSchedule.getId());
+                    courseScheduleTeacherSalary.setGroupType(courseSchedule.getGroupType());
+                    courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
                     courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
                     courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
                     courseScheduleTeacherSalary.setExpectSalary(salary);
@@ -1053,6 +1057,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 for (StudentRegistration studentRegistration : studentList) {
                     CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+                    courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                    courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                     courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
                     courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
                     courseScheduleStudentPayment.setExpectPrice(expectPrice);
@@ -1245,6 +1251,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
                     courseScheduleTeacherSalary.setCourseScheduleId(courseSchedule.getId());
+                    courseScheduleTeacherSalary.setGroupType(courseSchedule.getGroupType());
+                    courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
                     courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
                     courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
                     courseScheduleTeacherSalary.setExpectSalary(salary);
@@ -1255,6 +1263,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 for (StudentRegistration studentRegistration : studentList) {
                     CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+                    courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                    courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                     courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
                     courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
                     courseScheduleStudentPayment.setExpectPrice(expectPrice);
@@ -1445,6 +1455,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
                     courseScheduleTeacherSalary.setCourseScheduleId(courseSchedule.getId());
+                    courseScheduleTeacherSalary.setGroupType(courseSchedule.getGroupType());
+                    courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
                     courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
                     courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
                     courseScheduleTeacherSalary.setExpectSalary(salary);
@@ -1455,6 +1467,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 for (StudentRegistration studentRegistration : studentList) {
                     CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+                    courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                    courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                     courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
                     courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
                     courseScheduleStudentPayment.setExpectPrice(expectPrice);

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

@@ -112,6 +112,8 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = new ArrayList<>();
         for (CourseSchedule courseSchedule : courseScheduleList) {
             CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+            courseScheduleStudentPayment.setGroupType(courseSchedule.getGroupType());
+            courseScheduleStudentPayment.setMusicGroupId(courseSchedule.getMusicGroupId());
             courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
             courseScheduleStudentPayment.setUserId(userId);
             courseScheduleStudentPayment.setExpectPrice(coursePrice);
@@ -189,6 +191,8 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         for (CourseSchedule courseSchedule : courseScheduleList) {
             for (String userIdStr : userIdStrSet) {
                 CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
+                courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                 courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
                 courseScheduleStudentPayment.setUserId(Integer.parseInt(userIdStr));
                 courseScheduleStudentPayment.setExpectPrice(coursePrice);

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

@@ -179,6 +179,8 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 //课程与老师薪水表
                 CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
                 courseScheduleTeacherSalary.setCourseScheduleId(classGroupNoStartCourseSchedule.getId());
+                courseScheduleTeacherSalary.setGroupType(classGroupNoStartCourseSchedule.getGroupType());
+                courseScheduleTeacherSalary.setMusicGroupId(classGroupNoStartCourseSchedule.getMusicGroupId());
                 courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
                 courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
                 courseScheduleTeacherSalary.setExpectSalary(salary);

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

@@ -60,6 +60,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 				//创建学生课程应缴费记录
 				CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
 				courseScheduleStudentPayment.setUserId(userId);
+	            courseScheduleStudentPayment.setGroupType(courseSchedules.get(i).getGroupType());
+	            courseScheduleStudentPayment.setMusicGroupId(courseSchedules.get(i).getMusicGroupId());
 				courseScheduleStudentPayment.setCourseScheduleId(courseSchedules.get(i).getId());
 				courseScheduleStudentPayment.setClassGroupId(courseSchedules.get(i).getClassGroupId());
 

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

@@ -90,6 +90,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
                 }
                 courseScheduleTeacherSalary.setCourseScheduleId(courseSchedules.get(i).getId());
+                courseScheduleTeacherSalary.setGroupType(courseSchedules.get(i).getGroupType());
+                courseScheduleTeacherSalary.setMusicGroupId(courseSchedules.get(i).getMusicGroupId());
                 courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
                 courseScheduleTeacherSalary.setUserId(courseSchedules.get(i).getActualTeacherId().intValue());
                 courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());

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

@@ -232,6 +232,8 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 
 		CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
 		courseScheduleStudentPayment.setUserId(user.getId());
+        courseScheduleStudentPayment.setGroupType(courseScheduleByDemoGroup.getGroupType());
+        courseScheduleStudentPayment.setMusicGroupId(courseScheduleByDemoGroup.getMusicGroupId());
 		courseScheduleStudentPayment.setCourseScheduleId(courseScheduleByDemoGroup.getId());
 		courseScheduleStudentPayment.setClassGroupId(courseScheduleByDemoGroup.getClassGroupId());
 		courseScheduleStudentPayment.setExpectPrice(demoGroup.getPrice());
@@ -239,6 +241,8 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 
 		CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
 		courseScheduleTeacherSalary.setCourseScheduleId(courseScheduleByDemoGroup.getId());
+        courseScheduleTeacherSalary.setGroupType(courseScheduleByDemoGroup.getGroupType());
+        courseScheduleTeacherSalary.setMusicGroupId(courseScheduleByDemoGroup.getMusicGroupId());
 		courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
 		courseScheduleTeacherSalary.setUserId(demoGroup.getUserId());
 		courseScheduleTeacherSalary.setExpectSalary(demoGroup.getPrice());

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

@@ -359,6 +359,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 					studentAttendance.setClassGroupId(classGroup.getId());
 					studentAttendance.setCourseScheduleId(courseScheduleId.longValue());
 					studentAttendance.setCurrentClassTimes(classGroup.getCurrentClassTimes());
+					studentAttendance.setGroupType(classGroup.getGroupType());
 					studentAttendance.setMusicGroupId(classGroup.getMusicGroupId());
 					studentAttendance.setStatus(statusEnum);
 					studentAttendance.setUserId(userId);

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

@@ -181,6 +181,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		if(Objects.isNull(teacherAttendance)){
 			teacherAttendance=new TeacherAttendance();
+			teacherAttendance.setGroupType(courseSchedule.getGroupType());
 			teacherAttendance.setCourseScheduleId(courseScheduleId.longValue());
 			teacherAttendance.setCurrentClassTimes(classGroup.getCurrentClassTimes());
 			teacherAttendance.setTeacherId(userId);
@@ -192,6 +193,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		}else if(teacherAttendance.getSignInTime() != null && teacherAttendance.getSignOutTime() != null){
 			return;
 		}
+		teacherAttendance.setGroupType(courseSchedule.getGroupType());
 		teacherAttendance.setTeacherId(userId);
 		teacherAttendance.setClassGroupId(classGroup.getId());
 		teacherAttendance.setMusicGroupId(classGroup.getMusicGroupId());