Explorar o código

feat(user): 优化用户信息查询并添加新字段

- 修复 MessageReceiversServiceImpl 中的空指针异常
- 在 PrivacyPolicyVo 和 TermsOfServiceVo 中添加创建时间和更新时间字段
- 在 UserVo 中添加比赛积分和门票数量字段
fugui001 hai 4 meses
pai
achega
c2326cbbdd

+ 10 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/PrivacyPolicyVo.java

@@ -61,4 +61,14 @@ public class PrivacyPolicyVo implements Serializable {
     @ExcelProperty(value = "消息内容text")
     private String contentText;
 
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
 }

+ 10 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/domain/vo/TermsOfServiceVo.java

@@ -63,4 +63,14 @@ public class TermsOfServiceVo implements Serializable {
     @ExcelProperty(value = "消息内容text")
     private String contentText;
 
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
 }

+ 6 - 3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/MessageReceiversServiceImpl.java

@@ -82,12 +82,15 @@ public class MessageReceiversServiceImpl implements IMessageReceiversService {
             }
 
             Long receiveUserId = record.getUserId();
-            UserVo userVo = iUserService.queryById(receiveUserId);
-            if(userVo!=null){
-                record.setReceiveUserName(userVo.getNickName());
+            if(receiveUserId!=null){
+                UserVo userVo = iUserService.queryById(receiveUserId);
+                if(userVo!=null){
+                    record.setReceiveUserName(userVo.getNickName());
+                }
             }else{
                 record.setReceiveUserName("所有人");
             }
+
         }
         return TableDataInfo.build(result);
     }

+ 15 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/UserServiceImpl.java

@@ -57,7 +57,21 @@ public class UserServiceImpl implements IUserService {
      */
     @Override
     public UserVo queryById(Long id){
-        return baseMapper.selectVoByIdInfo(id);
+        UserVo userVo = baseMapper.selectVoByIdInfo(id);
+        int userRewardCount = rewardClaimsMapper.selectUserRewardCount(userVo.getId());
+        userVo.setTournamentCount(userRewardCount);
+
+        PlayerItemsVo playerItemsVo = playerItemsMapper.selectPlayerItemsInfo(userVo.getId(), 1001L);
+        if(playerItemsVo!=null){
+            //道具数量 /门票数
+            userVo.setItemsQuantity(playerItemsVo.getQuantity());
+        }
+        Long jiFenCount = playerItemsMapper.selectPlayerJiFenCount(userVo.getId());
+        if(jiFenCount!=null){
+            //参赛积分
+            userVo.setPointsQuantity(jiFenCount);
+        }
+        return userVo;
     }
 
     /**