Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1615,12 +1615,18 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("此学生存在退课申请，请到系统日志中查看");
 		}
 
+		ClassGroup classGroup = classGroupDao.findByVipGroup(studentRecoverInfo.getVipGroupId().longValue(), null);
+
 		Integer oldTeacherId=vipGroup.getUserId();
 		if(Objects.nonNull(studentRecoverInfo.getTeacherId())&&!studentRecoverInfo.getTeacherId().equals(vipGroup.getUserId())){
-			vipGroup.setUserId(studentRecoverInfo.getUserId());
-		}
+			vipGroup.setUserId(studentRecoverInfo.getTeacherId());
 
-		ClassGroup classGroup = classGroupDao.findByVipGroup(studentRecoverInfo.getVipGroupId().longValue(), null);
+			ImGroupMember[] imGroupMembers = new ImGroupMember[]{new ImGroupMember(oldTeacherId.toString())};
+			imFeignService.groupQuit(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, null));
+
+			ImGroupMember[] newImGroupMemberList = new ImGroupMember[]{new ImGroupMember(vipGroup.getUserId().toString())};
+			imFeignService.groupJoin(new ImGroupModel(classGroup.getId().toString(), newImGroupMemberList,null));
+		}
 
 		ClassGroupStudentMapper classStudentMapperByUserIdAndClassGroupId = classGroupStudentMapperDao.query(classGroup.getId(),
 				studentRecoverInfo.getUserId());