Merge branch 'dev/2024/0715/update-admin-Y' of Harper/feifan-backend-zx-admin into master

获取用户信息返回username

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/vo/DuserPageReqVO.java

@@ -47,4 +47,7 @@ public class DuserPageReqVO extends PageParam {
 
     @Schema(description = "用户名称", example = "张三")
     private String nickName;
+
+    @Schema(description = "用户名")
+    private String username;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/vo/DuserRespVO.java

@@ -78,4 +78,13 @@ public class DuserRespVO {
 
     @Schema(description = "用户积分")
     private Long integral;
+
+    @Schema(description = "用户名")
+    private String username;
+
+    @Schema(description = "冻结积分")
+    private Long freezeIntegral;
+
+    @Schema(description = "推荐人用户名")
+    private String ancUsername;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/duser/DuserServiceImpl.java

@@ -188,6 +188,12 @@ public class DuserServiceImpl implements DuserService {
 
     @Override
     public PageResult<DuserDO> getDuserPage(DuserPageReqVO pageReqVO) {
+
+        if(pageReqVO.getUsername() != null){
+            MemberUserDO user = memberUserService.getUserByUsername(pageReqVO.getUsername());
+            pageReqVO.setUserId(user.getId());
+        }
+
         return duserMapper.selectPage(pageReqVO);
     }
 
@@ -303,8 +309,17 @@ public class DuserServiceImpl implements DuserService {
                     .eq(SharePathDO::getDescendant, duserRespVO.getUserId())
                     .eq(SharePathDO::getDepth, 1)
             );
-            duserRespVO.setAncNickName(sharePathDO != null ? sharePathDO.getAncNickName() : "");
-            duserRespVO.setAvatar(memberUserService.getUser(duserRespVO.getUserId()).getAvatar());
+            if(sharePathDO != null){
+                duserRespVO.setAncNickName(sharePathDO.getAncNickName());
+                MemberUserDO user = memberUserService.getUser(sharePathDO.getAncestor());
+                duserRespVO.setAncUsername(user.getUsername());
+            }else{
+                duserRespVO.setAncNickName("");
+            }
+
+            MemberUserDO user = memberUserService.getUser(duserRespVO.getUserId());
+            duserRespVO.setAvatar(user.getAvatar());
+            duserRespVO.setUsername(user.getUsername());
 
             SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duserRespVO.getSocialStatusId());
             if(socialStatus != null) {
@@ -315,6 +330,7 @@ public class DuserServiceImpl implements DuserService {
             IntegralDO integral = integralService.getIntegral(duserRespVO.getUserId());
             if(integral != null){
                 duserRespVO.setIntegral(integral.getCurrentQuota());
+                duserRespVO.setFreezeIntegral(integral.getFreezeQuota());
             }
         }
     }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserService.java

@@ -206,4 +206,10 @@ public interface MemberUserService {
      * @return 用户
      */
     List<MemberUserDO> getUserListBySystemUserId(Long systemUserId);
+
+    /**
+     * 根据用户名查询用户
+     * @param username 用户名
+     */
+    MemberUserDO getUserByUsername(String username);
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -345,4 +345,9 @@ public class MemberUserServiceImpl implements MemberUserService {
         return memberUserMapper.selectList(MemberUserDO::getSystemUsersId, systemUserId);
     }
 
+    @Override
+    public MemberUserDO getUserByUsername(String username) {
+        return memberUserMapper.selectOne(MemberUserDO::getUsername, username);
+    }
+
 }