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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 265483d..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
@@ -24,6 +24,7 @@
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;
@@ -2281,10 +2282,10 @@
/**
* 后台修改邻里圈
- * @param comActNeighborCircleAdminDTO 请求参数
+ * @param editNeighborCircleAdminVO 请求参数
*/
@PostMapping("/neighbor/changeStatusByAdmin")
- R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+ R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
/**
@@ -2300,7 +2301,7 @@
* @param id 邻里圈id
* @return 邻里圈列表
*/
- @PostMapping("/neighbor/detailNeighborByAdmin")
+ @GetMapping("/neighbor/detailNeighborByAdmin")
R detailNeighborByAdmin(@RequestParam("id")Long id);
/**
@@ -2388,9 +2389,25 @@
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