Merge branch 'local/1030-music' into develop-new

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

@@ -61,6 +61,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
     @Autowired
     private TeacherService teacherService;
 
+
     /**
      * 查询详情
      * @param id 详情ID
@@ -258,6 +259,10 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
         studentIds.addAll(teacherIds);
         Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> userMap = sysUserService.getMapByIds(studentIds);
 
+        String teacherAvatar = sysConfigService.findConfigValue(SysConfigConstant.TEACHER_AVATAR);
+        String studentAvatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
+
+
         for (UserMusicWrapper.UserMusic record : records) {
             SysUser sysUser = userMap.get(record.getUserId());
             if (sysUser != null) {
@@ -271,12 +276,18 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
                     record.setSubjectId(student.getSubjectId());
                     record.setVipFlag(student.getMembershipEndTime() != null && student.getMembershipEndTime().after(new Date()));
                 }
+                if (StringUtil.isEmpty(record.getAvatar())) {
+                    record.setAvatar(studentAvatar);
+                }
             } else {
                 Teacher teacher = teacherMap.get(record.getUserId());
                 if (teacher != null) {
                     record.setSubjectId(teacher.getSubjectId());
                     record.setVipFlag(teacher.getMembershipEndTime() != null && teacher.getMembershipEndTime().after(new Date()));
                 }
+                if (StringUtil.isEmpty(record.getAvatar())) {
+                    record.setAvatar(teacherAvatar);
+                }
             }
         }
 

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

@@ -10,12 +10,9 @@ import com.yonge.cooleshow.biz.dal.entity.UserMusicStar;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.mapper.UserMusicMapper;
 import com.yonge.cooleshow.biz.dal.mapper.UserMusicStarMapper;
-import com.yonge.cooleshow.biz.dal.service.StudentService;
-import com.yonge.cooleshow.biz.dal.service.SysUserService;
-import com.yonge.cooleshow.biz.dal.service.SubjectService;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.service.UserMusicStarService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.wrapper.UserMusicStarWrapper;
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -51,6 +48,9 @@ public class UserMusicStarServiceImpl extends ServiceImpl<UserMusicStarMapper, U
     @Autowired
     private SysUserService sysUserService;
 
+    @Autowired
+    private SysConfigService sysConfigService;
+
     /**
      * 查询详情
      * @param id 详情ID
@@ -96,22 +96,31 @@ public class UserMusicStarServiceImpl extends ServiceImpl<UserMusicStarMapper, U
         studentIds.addAll(teacherIds);
         Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> userMap = sysUserService.getMapByIds(studentIds);
 
+        String teacherAvatar = sysConfigService.findConfigValue(SysConfigConstant.TEACHER_AVATAR);
+        String studentAvatar = sysConfigService.findConfigValue(SysConfigConstant.STUDENT_AVATAR);
         for (UserMusicStarWrapper.UserMusicStar userMusicStar : userMusicStars) {
+
+            com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = userMap.get(userMusicStar.getUserId());
+            if (sysUser != null) {
+                userMusicStar.setUserName(sysUser.getUsername());
+                userMusicStar.setUserAvatar(sysUser.getAvatar());
+            }
             if (userMusicStar.getClientType() == ClientEnum.STUDENT) {
                 Student student = studentMap.get(userMusicStar.getUserId());
                 if (student != null) {
                     userMusicStar.setSubjectId(student.getSubjectId());
                 }
+                if (StringUtil.isEmpty(userMusicStar.getUserAvatar())) {
+                    userMusicStar.setUserAvatar(studentAvatar);
+                }
             } else {
                 Teacher teacher = teacherMap.get(userMusicStar.getUserId());
                 if (teacher != null) {
                     userMusicStar.setSubjectId(teacher.getSubjectId());
                 }
-            }
-            com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = userMap.get(userMusicStar.getUserId());
-            if (sysUser != null) {
-                userMusicStar.setUserName(sysUser.getUsername());
-                userMusicStar.setUserAvatar(sysUser.getAvatar());
+                if (StringUtil.isEmpty(userMusicStar.getUserAvatar())) {
+                    userMusicStar.setUserAvatar(teacherAvatar);
+                }
             }
         }