update

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

@@ -666,6 +666,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //获取班级老师总数map
             Map<Integer, Integer> numsMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherNums(StringUtils.join(classGroupIds, ",")))), HashMap.class);
             imGroupModels.forEach(e -> {
+                if(StringUtils.isNotEmpty(e.getGroupName())){
+                    e.setName(e.getGroupName() + " " + e.getName());
+                }
                 Integer num = numsMap.get(Integer.parseInt(e.getId()));
                 e.setCount((num == null ? 0 : num) + e.getCount());
             });

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

@@ -249,17 +249,16 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         //报名成功后，发送短信
-        String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + studentRegistration.getMusicGroupId();
+//        String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + studentRegistration.getMusicGroupId();
         String serverPhone = sysConfigDao.findConfigValue(SysConfigService.SERVER_PHONE);
         Subject subject = subjectDao.get(studentRegistration.getActualSubjectId());
-        MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
+//        MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
 
         Map<Integer, String> map = new HashMap<>(1);
         map.put(studentRegistration.getUserId(), studentRegistration.getParentsPhone());
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,
                 MessageTypeEnum.SMS_APPLY_MESSAGE, map, null, 0, "",
-                studentRegistration.getParentsName(), subject.getName(), HttpUtil.getSortUrl(studentApplyUrl),
-                DateUtil.format(musicGroup.getApplyExpireDate(), DateUtil.DATE_FORMAT_MIN), serverPhone);
+                studentRegistration.getParentsName(), subject.getName(), serverPhone);
 
         redisCache.releaseLocked(key, threadId);
         return studentRegistration;

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

@@ -109,6 +109,16 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateTea(Teacher teacher) {
+		Teacher teacher1 = teacherDao.get(teacher.getId());
+		if(null==teacher1){
+			throw new BizException("教师信息不存在");
+		}
+		if(StringUtils.isNotEmpty(teacher.getPhone())){
+			SysUser sysUser = sysUserFeignService.queryUserByMobile(teacher.getPhone());
+			if(sysUser != null && !sysUser.getId().equals(teacher.getId())){
+				throw new BizException("手机号已存在");
+			}
+		}
 		teacher.setUpdateTime(new Date());
 		teacherDao.update(teacher);
 		teacherDao.updateUser(teacher);

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

@@ -254,10 +254,12 @@
         <result column="student_num_" property="count"/>
         <result column="img_" property="img"/>
         <result column="teacher_ids_" property="teacherIds"/>
+        <result column="group_name_" property="groupName"/>
     </resultMap>
     <select id="queryUserGroups" resultMap="imGroupModel">
-        SELECT cg.id_,cg.name_,cg.student_num_,cg.img_ FROM class_group_student_mapper cgsm
+        SELECT cg.id_,cg.name_,cg.student_num_,cg.img_,mg.group_name_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
         <where>
             cg.del_flag_ = 0 AND cgsm.status_ != 'QUIT'
             <if test="userId != null">
@@ -439,6 +441,7 @@
             csts.user_id_ = #{teacherId}
             AND cg.group_type_='MUSIC'
             AND cg.del_flag_ = 0
+            AND mg.status_ = 'PROGRESS'
         GROUP BY cg.id_
     </select>
     <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
@@ -465,7 +468,7 @@
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
             LEFT JOIN school s ON vg.teacher_school_id_ = s.id_
         WHERE
-            vg.user_id_ = #{teacherId}
+            vg.user_id_ = #{teacherId} AND vg.status_ = 2
         GROUP BY
         vg.id_,cg.id_
     </select>

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

@@ -1189,7 +1189,9 @@
     <select id="queryMusicGroupIds" resultType="java.lang.String">
         SELECT DISTINCT cgsm.music_group_id_ FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        WHERE cgsm.user_id_ = #{userId} AND cgsm.status_ != 'QUIT' AND cg.del_flag_ = 0
+        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_ AND cg.group_type_ = 'MUSIC'
+        LEFT JOIN vip_group vg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
+        WHERE cgsm.user_id_ = #{userId} AND cgsm.status_ != 'QUIT' AND cg.del_flag_ = 0 AND (mg.status_ = 'PROGRESS' OR vg.status_ = 3)
         ORDER BY cgsm.music_group_id_
         <include refid="global.limit"/>
     </select>

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

@@ -207,7 +207,7 @@
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
 		LEFT JOIN sys_user su ON  su.id_ = sr.user_id_
-		WHERE sr.user_id_ = #{userId} AND sr.music_group_status_ != 'QUIT'
+		WHERE sr.user_id_ = #{userId} AND sr.music_group_status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
 		ORDER BY mg.create_time_ DESC
 	</select>
 

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImGroupModel.java

@@ -9,6 +9,7 @@ public class ImGroupModel {
     private String name;
     private String teacherIds;
     private String img;
+    private String groupName;
     private Integer minute;
     private Integer count;
     private Integer status;
@@ -31,6 +32,14 @@ public class ImGroupModel {
         this.name = name;
     }
 
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
     public String getTeacherIds() {
         return teacherIds;
     }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -29,7 +29,6 @@ public class TeacherController extends BaseController {
     private TeacherService teacherService;
     @Autowired
     private SubjectService subjectService;
-
     @Autowired
     private ClassGroupService classGroupService;
     @Autowired