Merge branch 'zx_saas_0614' of http://git.dayaedu.com/yonge/mec into test

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

@@ -400,12 +400,14 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                     sysUserFeignService.exitByPhone("teacher", sysUser.getPhone());
                 } else if (sysUser.getUserType().contains("SYSTEM")) {
                     sysUserFeignService.exitByPhone("system", sysUser.getPhone());
+                    sysUserFeignService.exitByPhone("education", sysUser.getPhone());
                 }
                 break;
             case DEMISSION:
                 employeeDao.updateUserLock(employeeId, 1);
                 employeeDao.updateUserDemissionDate(employeeId);
                 sysUserFeignService.exitByPhone("system", sysUser.getPhone());
+                sysUserFeignService.exitByPhone("education", sysUser.getPhone());
 
                 //更新OA信息
                 oaUserService.delOaUser(employee.getUserId());
@@ -634,7 +636,8 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         //冻结用户
         employeeDao.updateUserLock(levelUserId, 1);
         //用户退出登陆
-        sysUserFeignService.exitByPhone("SYSTEM", teacherDao.getUser(levelUserId).getPhone());
+        sysUserFeignService.exitByPhone("system", teacherDao.getUser(levelUserId).getPhone());
+        sysUserFeignService.exitByPhone("education", teacherDao.getUser(levelUserId).getPhone());
         CompletableFuture.runAsync(() -> {
             //获取用户担任教务老师、维修技师的所有乐团列表
             List<String> musicGroupIds = employeeDao.queryMusicGroupIdByUserId(levelUserId);

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

@@ -3068,6 +3068,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
             classGroup.setStudentNum(classGroup.getStudentNum() - 1);
             classGroupDao.update(classGroup);
+            //学员退出班级群
+            imGroupMemberService.quit(classGroup.getId().toString(), studentId);
             return BaseController.succeed();
         }
 
@@ -3909,6 +3911,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
             }
             teacherPush(vipGroup);
+            imGroupService.cancel(classGroup.getId().toString());
             return;
         }
 
@@ -3929,6 +3932,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             classGroupDao.update(classGroup);
             teacherPush(vipGroup);
 //			stopVipPush(vipGroup.getId(),vipGroup.getName());
+            imGroupService.cancel(classGroup.getId().toString());
             return;
         }