Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentService.java

@@ -130,5 +130,4 @@ public interface StudentService extends IService<Student> {
      */
     void updateTenant(Student student, Long toTenantId);
 
-    void addStudent(StudentWrapper.Student student);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -537,7 +537,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 });
             }
 //             删除好友
-            imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),ClientEnum.TEACHER.getCode());
+            imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),
+                    ClientEnum.STUDENT.getCode());
         }
         if (toTenantId != null && toTenantId != -1L) {
             // 加好友
@@ -555,46 +556,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 .update();
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void addStudent(StudentWrapper.Student student) {
-        // 更新头像
-        if (StringUtils.isEmpty(student.getAvatar())) {
-            String avatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
-            student.setAvatar(avatar);
-        }
-        SysUser sysUser = employeeDao.querySysUserByPhone(student.getPhone());
-        if (sysUser == null) {
-            sysUser = new SysUser();
-            sysUser.setUserType(ClientEnum.STUDENT.getCode());
-            sysUser.setGender(student.getGender());
-            //设置默认头像
-            sysUser.setAvatar(student.getAvatar());
-
-            sysUser.setUsername(student.getName());
-            sysUser.setPhone(student.getPhone());
-            //初始密码，手机号后6位
-            String password = "klx" + sysUser.getPhone().substring(sysUser.getPhone().length() - 4);
-            sysUser.setPassword(new BCryptPasswordEncoder().encode(password));
-            //插入
-            employeeDao.insertSysUser(sysUser);
-        } else {
-            if(StringUtils.isNotEmpty(sysUser.getUserType()) && sysUser.getUserType().contains(ClientEnum.STUDENT.getCode())){
-                throw new BizException("手机号已经注册学生账号");
-            }
-            if (StringUtil.isEmpty(sysUser.getUserType())) {
-                sysUser.setUserType(ClientEnum.STUDENT.getCode());
-            } else if (!sysUser.getUserType().contains(ClientEnum.STUDENT.getCode())) {
-                sysUser.setUserType(sysUser.getUserType() + "," + ClientEnum.STUDENT.getCode());
-            }
-            sysUser.setGender(student.getGender());
-            employeeDao.updateSysUser(sysUser);
-        }
-
-        student.setId(sysUser.getId());
-        this.save(student);
-    }
-
     private Boolean updateStudent(StudentWrapper.Student studentInfo) {
         StudentVo student = detail(studentInfo.getId());
         if (student == null) {
@@ -624,7 +585,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                 });
             }
 //             删除好友
-            imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),ClientEnum.TEACHER.getCode());
+            imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),
+                    ClientEnum.STUDENT.getCode());
         }