From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java |   84 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 80 insertions(+), 4 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 3b28c81..52fb796 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
@@ -1,12 +1,12 @@
 package com.panzhihua.applets.api;
 
 import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+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.*;
@@ -63,11 +63,87 @@
     }
 
     @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
-    @PostMapping("neighbor/detail")
+    @PostMapping("detail")
     public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
         return communityService.neighborDetailByApp(neighborCircleAppDTO);
     }
 
+    @ApiOperation(value = "分页查询用户邻里圈审核列表" , response = ComActNeighborCircleAppVO.class)
+    @PostMapping("user/page")
+    public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        neighborCircleAppDTO.setUserId(userId);
+        return communityService.neighborExamineByApp(neighborCircleAppDTO);
+    }
+
+    @ApiOperation(value = "邻里圈点赞")
+    @PostMapping("fabulous")
+    public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        fabulousAppDTO.setUserId(userId);
+        return communityService.neighborFabulousByApp(fabulousAppDTO);
+    }
+
+    @ApiOperation(value = "邻里圈转发")
+    @PostMapping("forward")
+    public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        forwardAppDTO.setUserId(userId);
+        return communityService.neighborForwardByApp(forwardAppDTO);
+    }
+
+    @ApiOperation(value = "邻里圈评论")
+    @PostMapping("comment")
+    public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        commentAppDTO.setUserId(userId);
+        return communityService.neighborCommentByApp(commentAppDTO);
+    }
+
+    @ApiOperation(value = "邻里圈回复")
+    @PostMapping("reply")
+    public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        replyAppDTO.setUserId(userId);
+        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);
+    }
 
 }
 

--
Gitblit v1.7.1