用户模块 补全头像信息返回

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/AvatarService.java

@@ -23,7 +23,7 @@ public interface AvatarService {
      * @param memberId 用户id
      * @return 头像路径
      */
-    String selectByMemberId(String memberId);
+    String selectAvatarByMemberId(String memberId);
 
     /**
      * 获取头像上传的token

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/AuthServiceImpl.java

@@ -300,7 +300,7 @@ public class AuthServiceImpl implements AuthService {
                     memberVo.setPhone(member.getPhone());
                     memberVo.setPhoneZone(member.getPhoneZone());
                     memberVo.setTimeZone(member.getTimeZone());
-                    memberVo.setAvatarUrl(avatarService.selectByMemberId(memberId));
+                    memberVo.setAvatarUrl(avatarService.selectAvatarByMemberId(memberId));
                 }else {
                     if("false".equals(password)){
                         memberVo.setName(member.getName());
@@ -309,7 +309,7 @@ public class AuthServiceImpl implements AuthService {
                         memberVo.setPhoneZone(member.getPhoneZone());
                         memberVo.setTimeZone(member.getTimeZone());
                         memberId = member.getId();
-                        memberVo.setAvatarUrl(avatarService.selectByMemberId(memberId));
+                        memberVo.setAvatarUrl(avatarService.selectAvatarByMemberId(memberId));
                     }
                 }
             }else {
@@ -324,7 +324,7 @@ public class AuthServiceImpl implements AuthService {
                         memberVo.setPhoneZone(member.getPhoneZone());
                         memberVo.setTimeZone(member.getTimeZone());
                         memberId = member.getId();
-                        memberVo.setAvatarUrl(avatarService.selectByMemberId(memberId));
+                        memberVo.setAvatarUrl(avatarService.selectAvatarByMemberId(memberId));
                     }else {
                         throw new BackendRuntimeException("账号/密码输入有误");
                     }

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/AvatarServiceImpl.java

@@ -51,14 +51,14 @@ public class AvatarServiceImpl implements AvatarService {
     }
 
     @Override
-    public String selectByMemberId(String memberId) {
+    public String selectAvatarByMemberId(String memberId) {
         AvatarsExample example = new AvatarsExample();
         example.createCriteria().andMemberIdEqualTo(memberId);
         List<Avatars> avatars = avatarsMapper.selectByExample(example);
         if(CollectionUtils.isEmpty(avatars)){
             return "";
         }
-        return avatars.get(0).getAvatar();
+        return ossPrefixUrl + avatars.get(0).getAvatar();
     }
 
     @Override

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/MemberServiceImpl.java

@@ -18,10 +18,7 @@ import cn.kdan.pdf.backend.core.pojo.app.BindAccountVo;
 import cn.kdan.pdf.backend.core.pojo.app.MemberInfoVo;
 import cn.kdan.pdf.backend.core.pojo.app.MemberVo;
 import cn.kdan.pdf.backend.core.pojo.app.SocialAccountVo;
-import cn.kdan.pdf.backend.core.service.AuthService;
-import cn.kdan.pdf.backend.core.service.MemberService;
-import cn.kdan.pdf.backend.core.service.SocialAccountService;
-import cn.kdan.pdf.backend.core.service.UserService;
+import cn.kdan.pdf.backend.core.service.*;
 import constant.CommonConstant;
 import enums.CommonEnum;
 import exception.BackendRuntimeException;
@@ -41,7 +38,6 @@ import utils.CommonUtils;
 import utils.RedisUtils;
 import utils.SMSUtils;
 
-import javax.naming.Name;
 import java.math.BigDecimal;
 import java.util.*;
 
@@ -62,7 +58,7 @@ public class MemberServiceImpl implements MemberService {
     @Autowired
     private SMSUtils smsUtils;
     @Autowired
-    private AvatarsMapper avatarsMapper;
+    private AvatarService avatarService;
     @Autowired
     private RedisUtils redisUtils;
     @Autowired
@@ -290,12 +286,8 @@ public class MemberServiceImpl implements MemberService {
         } else {
             memberInfo.setUsedSpacePercent(BigDecimal.ZERO);
         }
-        AvatarsExample avatarsExample = new AvatarsExample();
-        avatarsExample.createCriteria().andMemberIdEqualTo(member.getId());
-        List<Avatars> avatars = avatarsMapper.selectByExample(avatarsExample);
-        if (!CollectionUtils.isEmpty(avatars)) {
-            memberInfo.setAvatarUrl(avatars.get(0).getAvatar());
-        }
+
+        memberInfo.setAvatarUrl(avatarService.selectAvatarByMemberId(member.getId()));
 
         //根据用户id查询订阅数据
         SubscriptionsExample example = new SubscriptionsExample();
@@ -607,12 +599,7 @@ public class MemberServiceImpl implements MemberService {
     public MemberVo createMemberVo(Members member){
         MemberVo vo = new MemberVo();
         BeanUtils.copyProperties(member,vo);
-        AvatarsExample example = new AvatarsExample();
-        example.createCriteria().andMemberIdEqualTo(member.getId());
-        List<Avatars> avatars = avatarsMapper.selectByExample(example);
-        if(!CollectionUtils.isEmpty(avatars)){
-            vo.setAvatarUrl(avatars.get(0).getAvatar());
-        }
+        vo.setAvatarUrl(avatarService.selectAvatarByMemberId(member.getId()));
         return vo;
     }