Merge remote-tracking branch 'origin/master'

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

@@ -954,6 +954,17 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
+
+            Map<Integer, String> teacherMap = new HashMap<>();
+            teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                    teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
+                    practiceGroup.getType().getMsg(), practiceGroup.getName());
+            Map<Integer, String> teacherPhoneMap = new HashMap<>();
+            teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                    teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
+                    practiceGroup.getType().getMsg(), practiceGroup.getName());
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -1486,11 +1497,13 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
             Map<Integer, String> teacherMap = new HashMap<>();
             teacherMap.put(practiceGroupBuyParams.getUserId(), practiceGroupBuyParams.getUserId().toString());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
-                    teacherMap, null, 0, null, "TEACHER", teacher.getRealName(), "试听课", practiceGroupBuyParams.getName());
+                    teacherMap, null, 0, null, "TEACHER", teacher.getRealName(),
+                    practiceGroupBuyParams.getType().getMsg(), practiceGroupBuyParams.getName());
             Map<Integer, String> teacherPhoneMap = new HashMap<>();
             teacherPhoneMap.put(practiceGroupBuyParams.getUserId(), teacher.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
-                    teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(), "试听课", practiceGroupBuyParams.getName());
+                    teacherPhoneMap, null, 0, null, "TEACHER", teacher.getRealName(),
+                    practiceGroupBuyParams.getType().getMsg(), practiceGroupBuyParams.getName());
         }catch (Exception e){
             e.printStackTrace();
         }

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

@@ -2125,6 +2125,17 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
+        Map<Integer, String> teacherMap = new HashMap<>();
+        teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                teacherMap, null, 0, null, "TEACHER",
+                teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+        Map<Integer, String> teacherPhoneMap = new HashMap<>();
+        teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
+        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                teacherPhoneMap, null, 0, null, "TEACHER",
+                teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+
         studentDao.updateStudentServiceTag(practiceGroup.getStudentId(), null, YesOrNoEnum.YES.getCode());
 
         imUserFriendService.refreshGroupImUserFriend(practiceGroup.getId().toString(), GroupType.PRACTICE);
@@ -3305,6 +3316,19 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             userPhoneMap.put(practiceGroup.getStudentId(), student.getPhone());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.PAY_PRACTICE_BUY_SUCCESS,
                     userPhoneMap, null, 0, null, "STUDENT", groupStartTime, groupEndTime, teacherName, drillTimesOnWeek, firstCourseStartTime);
+
+
+
+            Map<Integer, String> teacherMap = new HashMap<>();
+            teacherMap.put(practiceGroup.getUserId(), practiceGroup.getUserId().toString());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                    teacherMap, null, 0, null, "TEACHER",
+                    teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
+            Map<Integer, String> teacherPhoneMap = new HashMap<>();
+            teacherPhoneMap.put(practiceGroup.getUserId(), teacher.getPhone());
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI, MessageTypeEnum.PRACTICE_CREATE_TEACHER_PUSH,
+                    teacherPhoneMap, null, 0, null, "TEACHER",
+                    teacher.getRealName(), practiceGroup.getType().getMsg(), practiceGroup.getName());
         } catch (Exception e) {
             e.printStackTrace();
         }

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -847,7 +847,7 @@
 		FROM
 			student_registration sr
 				LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-				LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_
+				LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_ AND cgsm.status_='NORMAL'
 		WHERE
 			sr.music_group_status_ = 'NORMAL'
 			AND mg.status_ = 'PROGRESS'

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -901,6 +901,7 @@
             LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
                 AND cgsm.music_group_id_ = sr.music_group_id_
                 AND cgsm.user_id_ = sr.user_id_
+                AND cgsm.status_='NORMAL'
             LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
             LEFT JOIN organization organ ON mg.organ_id_=organ.id_
             LEFT JOIN `subject` sub ON sub.id_=sr.actual_subject_id_
@@ -918,6 +919,7 @@
             LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_ = 'MUSIC'
                 AND cgsm.music_group_id_ = sr.music_group_id_
                 AND cgsm.user_id_ = sr.user_id_
+                AND cgsm.status_='NORMAL'
             LEFT JOIN sys_user stu ON stu.id_ = sr.user_id_
         <include refid="queryNoClassMusicStudentsCondition" />
     </select>