From 8a7fbad84879f277e10f857004c31d57aeecbd5a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 14 五月 2021 11:22:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 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 286e8bc..1f1fcfd 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
@@ -2,14 +2,11 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
-import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
-import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
-import com.panzhihua.common.model.vos.shop.*;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
@@ -41,6 +38,11 @@
return R.fail("请先绑定社区");
}
neighborCircleAppDTO.setCommunityId(communityId);
+
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId != null){
+ neighborCircleAppDTO.setUserId(userId);
+ }
return communityService.pageNeighborByApp(neighborCircleAppDTO);
}
@@ -63,13 +65,18 @@
}
@ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
- @PostMapping("neighbor/detail")
+ @PostMapping("detail")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ neighborCircleAppDTO.setUserId(userId);
return communityService.neighborDetailByApp(neighborCircleAppDTO);
}
- @ApiOperation(value = "分页查询用户邻里圈列表" , response = ComActNeighborCircleAppVO.class)
- @PostMapping("neighbor/user/page")
+ @ApiOperation(value = "分页查询用户邻里圈审核列表" , response = ComActNeighborCircleAppVO.class)
+ @PostMapping("user/page")
public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
if(userId == null){
@@ -80,7 +87,7 @@
}
@ApiOperation(value = "邻里圈点赞")
- @PostMapping("neighbor/fabulous")
+ @PostMapping("fabulous")
public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
if(userId == null){
@@ -91,7 +98,7 @@
}
@ApiOperation(value = "邻里圈转发")
- @PostMapping("neighbor/forward")
+ @PostMapping("forward")
public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
if(userId == null){
@@ -102,7 +109,7 @@
}
@ApiOperation(value = "邻里圈评论")
- @PostMapping("neighbor/comment")
+ @PostMapping("comment")
public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
if(userId == null){
@@ -113,7 +120,7 @@
}
@ApiOperation(value = "邻里圈回复")
- @PostMapping("neighbor/reply")
+ @PostMapping("reply")
public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
if(userId == null){
@@ -123,5 +130,37 @@
return communityService.neighborReplyByApp(replyAppDTO);
}
+ @ApiOperation(value = "邻里圈取消点赞")
+ @PostMapping("cancel/fabulous")
+ public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityService.neighborFabulousCancelByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈添加浏览记录")
+ @PostMapping("add/browse")
+ public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ addBrowseAppDTO.setUserId(userId);
+ return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
+ }
+
+ @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("请先登录");
+ }
+ commentReplyAppDTO.setUserId(userId);
+ return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
+ }
}
--
Gitblit v1.7.1