From a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706 Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期四, 13 五月 2021 13:16:25 +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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 2 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 d907416..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,17 +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; /** @@ -757,7 +760,7 @@ * * @return */ - @PostMapping("timedtaskactmicrowishall") + @PostMapping("timedtaskactmicrowish") R timedTaskActMicroWishAll(); /** @@ -2385,7 +2388,7 @@ * 邻里圈评论回复_基本详情 * @param id 参数 */ - @PostMapping("/neighbor/detailNeighborCommentReply") + @GetMapping("/neighbor/detailNeighborCommentReply") R detailNeighborCommentReply(@RequestParam("id") Long id); /** @@ -2410,4 +2413,52 @@ @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