1.更新老师学生头像

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -389,22 +389,12 @@ public interface SysConfigConstant {
     String TENANT_DEFAULT_HEAD = "tenant_default_head";
 
     /**
-     * 机构学生默认头像
+     * 老师默认头像
      */
-    String TENANT_STUDENT_BOY_AVATAR = "tenant_student_boy_avatar";
+    String TEACHER_AVATAR = "teacher_avatar";
 
     /**
-     * 机构学生默认头像
+     * 学生默认头像
      */
-    String TENANT_STUDENT_AVATAR = "tenant_student_avatar";
-
-    /**
-     * 机构老师默认头像
-     */
-    String TENANT_TEACHER_AVATAR = "tenant_teacher_avatar";
-
-    /**
-     * 机构学生默认头像
-     */
-    String TENANT_STUDENT_GIRL_AVATAR = "tenant_student_girl_avatar";
+    String STUDENT_AVATAR = "student_avatar";
 }

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

@@ -578,11 +578,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         }
         String avatar = studentInfo.getAvatar();
         if (StringUtils.isEmpty(avatar)) {
-            if (studentInfo.getGender().equals(1)) {
-                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_BOY);
-            } else {
-                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_GIRL);
-            }
+            avatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
             studentInfo.setAvatar(avatar);
         }
         // 解绑
@@ -622,11 +618,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     private Boolean createStudent(StudentWrapper.Student studentInfo) {
         String avatar = studentInfo.getAvatar();
         if (StringUtils.isEmpty(avatar)) {
-            if (studentInfo.getGender().equals(1)) {
-                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_BOY);
-            } else {
-                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_GIRL);
-            }
+            avatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
             studentInfo.setAvatar(avatar);
         }
         com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = getOrCreateAccount(studentInfo);
@@ -668,17 +660,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             sysUser = JSON.parseObject(JSON.toJSONString(studentInfo),
                     com.yonge.cooleshow.biz.dal.entity.SysUser.class);
             sysUser.setPhone(studentInfo.getPhone());
+            sysUser.setAvatar(studentInfo.getAvatar());
             if (StringUtils.isEmpty(studentInfo.getAvatar())) {
                 //设置默认头像
-                String avatar;
-                if (studentInfo.getGender().equals(1)) {
-                    avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_BOY);
-                } else {
-                    avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_GIRL);
-                }
+                String avatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
                 sysUser.setAvatar(avatar);
-            } else {
-                sysUser.setAvatar(studentInfo.getAvatar());
             }
             sysUser.setGender(studentInfo.getGender());
             sysUser.setUserType("STUDENT");

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

@@ -423,6 +423,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         if (StringUtils.isEmpty(sysUser.getUsername())) {
             sysUser.setUsername("游客" + sysUser.getId());
         }
+        //设置默认头像
+        if (StringUtil.isEmpty(sysUser.getAvatar())) {
+            String defaultHeard = sysConfigService.findConfigValue(SysConfigConstant.TEACHER_AVATAR);
+            sysUser.setAvatar(defaultHeard);
+        }
         employeeDao.updateSysUser(sysUser);
         return sysUser;
     }
@@ -534,12 +539,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         } else if (!sysUser.getUserType().contains("TEACHER")) {
             sysUser.setUserType(sysUser.getUserType() + ",TEACHER");
         }
-        //设置默认头像
-        if (StringUtil.isEmpty(sysUser.getAvatar())) {
-            String defaultHeard = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD);
-            sysUser.setAvatar(defaultHeard);
-        }
-
+        sysUser.setAvatar(teacherSubmitReq.getAvatar());
         sysUser.setUsername(teacherSubmitReq.getUsername());
         sysUser.setPhone(teacherSubmitReq.getPhone());
         return sysUser;

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -146,17 +146,6 @@ public class OpenStudentController extends BaseController {
             student.setId(studentId);
         }
 
-        // 配置头像
-        String avatar = student.getAvatar();
-        if (StringUtils.isEmpty(avatar)) {
-            if (student.getGender().equals(1)) {
-                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_BOY);
-            } else {
-                avatar = sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD_GIRL);
-            }
-            student.setAvatar(avatar);
-        }
-
         StudentWrapper.Student studentInfo = JSON.parseObject(JSON.toJSONString(student), StudentWrapper.Student.class);
         studentInfo.setTenantId(tenantInfo.getId());