From 63cdfcdab5b90e25dc468967c5e4ac0315965f02 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 10 八月 2021 09:55:38 +0800
Subject: [PATCH] 小程序登录以及实名认证模块改版
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index cdd7d30..21a30be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -34,15 +34,10 @@
@ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
@PostMapping("pageApp")
public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
- Long communityId = this.getLoginUserInfo().getCommunityId();
- if(communityId == null){
- return R.fail("请先绑定社区");
- }
- neighborCircleAppDTO.setCommunityId(communityId);
-
- Long userId = this.getLoginUserInfo().getUserId();
- if(userId != null){
- neighborCircleAppDTO.setUserId(userId);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
return communityService.pageNeighborByApp(neighborCircleAppDTO);
}
@@ -68,11 +63,15 @@
@ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
@PostMapping("detail")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
- Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
- return R.fail("请先登录");
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
- neighborCircleAppDTO.setUserId(userId);
+// Long userId = this.getLoginUserInfo().getUserId();
+// if(userId == null){
+// return R.fail("请先登录");
+// }
+// neighborCircleAppDTO.setUserId(userId);
return communityService.neighborDetailByApp(neighborCircleAppDTO);
}
@@ -101,11 +100,15 @@
@ApiOperation(value = "邻里圈转发")
@PostMapping("forward")
public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
- Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
- return R.fail("请先登录");
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ forwardAppDTO.setUserId(loginUserInfo.getUserId());
}
- forwardAppDTO.setUserId(userId);
+// Long userId = this.getLoginUserInfo().getUserId();
+// if(userId == null){
+// return R.fail("请先登录");
+// }
+// forwardAppDTO.setUserId(userId);
return communityService.neighborForwardByApp(forwardAppDTO);
}
@@ -156,20 +159,24 @@
@ApiOperation(value = "分页查询评论下所有回复",response = ComActNeighborCommentReplyAppVO.class)
@PostMapping("comment/reply")
public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
- Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
- return R.fail("请先登录");
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ commentReplyAppDTO.setUserId(loginUserInfo.getUserId());
}
- commentReplyAppDTO.setUserId(userId);
+// Long userId = this.getLoginUserInfo().getUserId();
+// if(userId == null){
+// return R.fail("请先登录");
+// }
+// commentReplyAppDTO.setUserId(userId);
return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
}
@ApiOperation(value = "查询社区邻里圈话题列表" , response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
- public R getNeighborTopicByApp() {
- Long communityId = this.getCommunityId();
- if(communityId == null){
- return R.fail("请先绑定社区");
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ communityId = loginUserInfo.getCommunityId();
}
return communityService.getNeighborTopicByApp(communityId);
}
--
Gitblit v1.7.1