From b9ee8fe325fa9746b284d3487df96d93d84d6473 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 12 五月 2021 18:05:09 +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 |   80 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 74 insertions(+), 6 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..cb73e7f 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
@@ -22,16 +22,20 @@
 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.AddNeighborCircleAdminVO;
 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;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.common.model.vos.user.UserPhoneVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -756,7 +760,7 @@
      *
      * @return
      */
-    @PostMapping("timedtaskactmicrowishall")
+    @PostMapping("timedtaskactmicrowish")
     R timedTaskActMicroWishAll();
 
     /**
@@ -2281,10 +2285,10 @@
 
     /**
      * 后台修改邻里圈
-     * @param comActNeighborCircleAdminDTO  请求参数
+     * @param editNeighborCircleAdminVO  请求参数
      */
     @PostMapping("/neighbor/changeStatusByAdmin")
-    R changeStatusByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+    R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
 
 
     /**
@@ -2300,7 +2304,7 @@
      * @param id  邻里圈id
      * @return  邻里圈列表
      */
-    @PostMapping("/neighbor/detailNeighborByAdmin")
+    @GetMapping("/neighbor/detailNeighborByAdmin")
     R detailNeighborByAdmin(@RequestParam("id")Long id);
 
     /**
@@ -2384,13 +2388,77 @@
      * 邻里圈评论回复_基本详情
      * @param id 参数
      */
-    @PostMapping("/neighbor/detailNeighborCommentReply")
+    @GetMapping("/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);
+
+
+    /**
+     * 邻里圈_添加
+     * @param addNeighborCircleAdminVO 参数
+     */
+    @PostMapping("/neighbor/addNeighborByAdmin")
+    R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);
+
+    /**
+     * 分页查询评论下所有回复
+     * @param commentReplyAppDTO    请求参数
+     * @return  回复列表
+     */
+    @PostMapping("/neighbor/neighborCommentReplyByApp")
+    R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+
+    /**
+     * 实有房屋_编辑
+     * @param villageId 实有房屋id
+     * @param comMngVillageVO 请求参数
+     * @return
+     */
+    @PostMapping("/editvillage/{villageId}")
+    R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO);
+
+    /**
+     * 商城系统配置
+     * @param comShopSysConfDTO
+     * @return
+     */
+    @PostMapping("/shop/conf/edit")
+    R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO);
+
+    /**
+     * 商城系统配置查询
+     * @param pageComShopSysConfDTO
+     * @return
+     */
+    @PostMapping("/shop/conf/get")
+    R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO);
+
+    /**
+     * 编辑实有人口_电子档案
+     * @param userElectronicFileVO
+     * @return
+     */
+    @PostMapping("/common/data/population/edit/electronicArchives")
+    R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);
 }

--
Gitblit v1.7.1