用户消息

score-common/src/main/java/com/live/common/domain/dto/api/UserInfoResponse.java

@@ -17,28 +17,12 @@ public class UserInfoResponse {
 
     private String userName;
 
-    //0普通用户 1主播
-    private int type;
-
     private String userDesc;
 
-    private Integer gold;
-
-    private Integer channel;
-
-    private String birthday;
-
-    private Integer sex;
-
-    private Integer level;
-
-    private String phone;
+    private Integer message;
 
-    //经验
-    private Long experience;
+    private Integer collectMatch;
 
-    private Long lackExperience;
+    private Integer collectTeam;
 
-    //默认0 主播申请审核中 1
-    private Integer applying;
 }

score-common/src/main/java/com/live/common/domain/dto/api/UserMsgResponse.java

@@ -13,14 +13,14 @@ public class UserMsgResponse {
 
     private Integer id;
 
-    private String userId;
-
     //0系统消息
-    private Integer msgType;
+    private String msgType;
 
     private String msgContent;
 
     //0未读 1已读
-    private Integer readStatus;
+//    private Integer readStatus;
+
+    private String time;
 
 }

score-common/src/main/java/com/live/common/service/impl/UserServiceImpl.java

@@ -50,7 +50,7 @@ public class UserServiceImpl implements UserService {
     @Resource
     private UserGoldMapper userGoldMapper;
     @Resource
-    private HuanXinIMService huanXinIMService;
+    private UserReserveMapper userReserveMapper;
     @Resource
     private RedisUtilsService redisUtilsService;
     @Resource
@@ -294,11 +294,17 @@ public class UserServiceImpl implements UserService {
         List<UserMsgResponse> userMsgResponses = messages.stream().map(b -> UserMsgResponse.builder()
                 .id(b.getId())
                 .msgContent(b.getMsgContent())
-                .msgType(b.getMsgType())
-                .readStatus(b.getReadStatus())
-                .userId(b.getUserId())
+                .msgType(b.getMsgType() == 0 ? "系统消息" : "其它消息")
+                .time(DateUtil.format(b.getUpdateTime(), DateUtil.YMDHMS_))
+//                .readStatus(b.getReadStatus())
                 .build()).collect(Collectors.toList());
-        return ResponseData.successResponse(new ResultPage<>(commonPage.getPageNum(), commonPage.getPageSize(), (int) count, userMsgResponses));
+
+        userMsgResponses.add(UserMsgResponse.builder()
+                .msgType("系统消息")
+                .msgContent("尊敬的用户:\n感谢您选择和使用本 APP!")
+                .time("2021-07-28 15:00:00")
+                .build());
+        return ResponseData.successResponse(new ResultPage<>(commonPage.getPageNum(), commonPage.getPageSize(), (int) count + 1, userMsgResponses));
     }
 
     @Override
@@ -565,36 +571,31 @@ public class UserServiceImpl implements UserService {
         User account = userMapper.selectOne(Wrappers.<User>lambdaQuery()
                 .eq(User::getPhone, userPhone)
         );
-        UserGold userGold = userGoldMapper.selectById(account.getId());
 
-        int applying = 0;
-        if (account.getType() == 0) {
-            ApplyAnchor applyAnchor = applyAnchorMapper.selectOne(Wrappers.<ApplyAnchor>lambdaQuery()
-                    .eq(ApplyAnchor::getStatus, 0)
-                    .eq(ApplyAnchor::getDeleted, StatusEnum.ENABLE.getCode())
-            );
-            if (applyAnchor != null) {
-                applying = 1;
-            }
-        } else {
-            applying = 2;
-        }
+        long count = userMessageMapper.selectCount(Wrappers.<UserMessage>lambdaQuery()
+                .eq(UserMessage::getDeleted, StatusEnum.ENABLE.getCode())
+                .eq(UserMessage::getUserId, account.getId())
+        );
+
+        long collectMatch = userReserveMapper.selectCount(Wrappers.<UserReserve>lambdaQuery()
+                .eq(UserReserve::getDeleted, StatusEnum.ENABLE.getCode())
+                .eq(UserReserve::getUserId, account.getId())
+                .eq(UserReserve::getType, 0)
+        );
+        long collectTeam = userReserveMapper.selectCount(Wrappers.<UserReserve>lambdaQuery()
+                .eq(UserReserve::getDeleted, StatusEnum.ENABLE.getCode())
+                .eq(UserReserve::getUserId, account.getId())
+                .eq(UserReserve::getType, 1)
+        );
 
         return ResponseData.successResponse(UserInfoResponse.builder()
-                .avatarUrl(StringUtils.isNotBlank(account.getUserIcon()) ? ConstantValue.AVATAR_URL + account.getUserIcon() : null)
-                .phone(account.getPhone())
+                .avatarUrl(ConstantValue.completeAddress(account.getUserIcon()))
                 .id(account.getId())
                 .userName(account.getUserName())
                 .userDesc(account.getUserDesc())
-                .channel(account.getChannel())
-                .gold(userGold.getGold())
-                .type(account.getType())
-                .birthday(DateUtil.format(account.getBirthday(), DateUtil.YMD_))
-                .level(account.getLevel())
-                .sex(account.getSex())
-                .experience(1L)
-                .lackExperience(0L)
-                .applying(applying)
+                .message((int) count + 1)
+                .collectMatch((int) collectMatch)
+                .collectTeam((int) collectTeam)
                 .build());
     }
 

score-server/src/main/java/com/live/server/config/IntercaptorConfig.java

@@ -24,7 +24,7 @@ public class IntercaptorConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**")
                 .excludePathPatterns("/common/**")
                 .excludePathPatterns("/user/login", "/user/register", "/user/sendSms", "/user/userFeedback" , "/user/getFeedbackList",
-                        "/user/loginByPc", "/user/registerByPc" ,"/user/forgotPassword", "/user/userInfoByIds")
+                        "/user/loginByPc", "/user/registerByPc" ,"/user/forgotPassword", "/user/userInfoByIds", "/user/loginByPwd")
                 .excludePathPatterns("/avatar/**")
                 .excludePathPatterns("/download/**")
                 .excludePathPatterns("/file/**")

score-server/src/main/java/com/live/server/controller/UserController.java

@@ -272,21 +272,21 @@ public class UserController {
 //        return userService.userApplyAnchor(userApplyAnchorRequest, request);
 //    }
 
-//    @PostMapping(value = "/getUserMsgList")
-//    @ApiOperation(value = "获取用户消息列表")
-//    @ApiResponses({
-//            @ApiResponse(code = 200, message = "成功处理请求"),
-//            @ApiResponse(code = 401, message = "没有权限访问该服务"),
-//            @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
-//            @ApiResponse(code = 404, message = "未发现该服务"),
-//            @ApiResponse(code = 500, message = "服务器内部错误")
-//    })
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "token", value = "登录凭证(登录后 token 值)", dataType = "String", paramType = "header", required = true)
-//    })
-//    public ResponseData<?> getUserMsgList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
-//        return userService.getUserMsgList(commonPage, request);
-//    }
+    @PostMapping(value = "/getUserMsgList")
+    @ApiOperation(value = "获取用户消息列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "成功处理请求"),
+            @ApiResponse(code = 401, message = "没有权限访问该服务"),
+            @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
+            @ApiResponse(code = 404, message = "未发现该服务"),
+            @ApiResponse(code = 500, message = "服务器内部错误")
+    })
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "登录凭证(登录后 token 值)", dataType = "String", paramType = "header", required = true)
+    })
+    public ResponseData<?> getUserMsgList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
+        return userService.getUserMsgList(commonPage, request);
+    }
 //
 //    @PostMapping(value = "/updateMsgStatus")
 //    @ApiOperation(value = "修改消息已读根据消息 id 数组")