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/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  124 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 4dbf52a..d907416 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5,6 +5,8 @@
 import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
 import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
 import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
 import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
 import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
@@ -20,6 +22,9 @@
 import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
 import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
 import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
+import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
 import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
 import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -2277,19 +2282,132 @@
 
     /**
      * 后台修改邻里圈
-     * @param comActNeighborCircleAdminDTO  请求参数
+     * @param editNeighborCircleAdminVO  请求参数
      */
     @PostMapping("/neighbor/changeStatusByAdmin")
-    R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+    R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
 
 
     /**
-     * 后台修改邻里圈
+     * 邻里圈_后台删除
      * @param id  邻里圈id
      * @return  邻里圈列表
      */
     @PostMapping("/neighbor/deleteByAdmin")
     R deleteByAdmin(@RequestParam("id")Long id);
 
+    /**
+     * 查看邻里圈基础_详情
+     * @param id  邻里圈id
+     * @return  邻里圈列表
+     */
+    @GetMapping("/neighbor/detailNeighborByAdmin")
+    R detailNeighborByAdmin(@RequestParam("id")Long id);
+
+    /**
+     * 邻里圈的所有评论_分页
+     * @param dto 请求参数
+     * @return 评论列表
+     */
+    @PostMapping("/neighbor/detailNeighborAllCommentByAdmin")
+    R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);
+
+    /**
+     * 评论的状态_修改
+     * @param vo 请求参数
+     */
+    @PostMapping("/neighbor/changeCommentStatusByAdmin")
+    R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);
+
+    /**
+     * 邻里圈评论_详情
+     * @param id 评论id
+     */
+    @GetMapping("/neighbor/detailNeighborCommentByAdmin")
+    R detailNeighborCommentByAdmin(@RequestParam("id") Long id);
+
+
+    /**
+     * 用户查询邻里圈列表
+     * @param neighborCircleAppDTO  请求参数
+     * @return  邻里圈列表
+     */
+    @PostMapping("/neighbor/neighborExamineByApp")
+    R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+    /**
+     * 邻里圈点赞
+     * @param fabulousAppDTO    请求参数
+     * @return  点赞结果
+     */
+    @PostMapping("/neighbor/neighborFabulousByApp")
+    R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+    /**
+     * 邻里圈转发
+     * @param forwardAppDTO 请求参数
+     * @return  转发结果
+     */
+    @PostMapping("/neighbor/neighborForwardByApp")
+    R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);
+
+    /**
+     * 邻里圈评论
+     * @param commentAppDTO 请求参数
+     * @return  评论结果
+     */
+    @PostMapping("/neighbor/neighborCommentByApp")
+    R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);
+
+    /**
+     * 邻里圈回复
+     * @param replyAppDTO   请求参数
+     * @return  回复结果
+     */
+    @PostMapping("/neighbor/neighborReplyByApp")
+    R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);
+
+    /**
+     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+     * @return  执行结果
+     */
+    @PostMapping("/neighbor/timeTaskCircleFlow")
+    R timedTaskNeighborCircleRecord();
+
+    /**
+     * 邻里圈评论回复_分页
+     * @param dto 参数
+     */
+    @PostMapping("/neighbor/detailNeighborCommentAllReply")
+    R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);
+
+    /**
+     * 邻里圈评论回复_基本详情
+     * @param id 参数
+     */
+    @PostMapping("/neighbor/detailNeighborCommentReply")
+    R detailNeighborCommentReply(@RequestParam("id") Long id);
+
+    /**
+     * 评论回复状态_修改
+     * @param changeStatusReplyVO 参数
+     */
+    @PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
+    R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+    /**
+     * 邻里圈取消点赞
+     * @param fabulousAppDTO    请求参数
+     * @return  取消点赞结果
+     */
+    @PostMapping("/neighbor/neighborFabulousCancelByApp")
+    R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+    /**
+     * 添加邻里圈浏览记录
+     * @param addBrowseAppDTO   请求参数
+     * @return  返回参数
+     */
+    @PostMapping("/neighbor/neighborAddBrowseByApp")
+    R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
 
 }

--
Gitblit v1.7.1