From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 30 七月 2021 18:16:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java index c90fe25..e3ab73b 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java @@ -4,10 +4,7 @@ import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; -import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO; -import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO; -import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO; -import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO; +import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.dtos.user.*; import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -376,8 +373,8 @@ * @return 协议集合 */ @PostMapping("listagreement") - public R listAgreement() { - return userService.listAgreement(); + public R listAgreement(@RequestParam("communityId") Long communityId) { + return userService.listAgreement(communityId); } /** @@ -937,7 +934,7 @@ * @return 修改结果 */ @PostMapping("editGridUser") - public R gridMemberEdit(@RequestBody EventGridMemberAddDTO gridMemberDTO){ + public R gridMemberEdit(@RequestBody EventGridMemberEditAdminDTO gridMemberDTO){ return userService.editGridUser(gridMemberDTO); } @@ -966,5 +963,29 @@ return userService.gridMemberEditStatus(gridMemberEditDTO); } + @GetMapping("big/no/tip") + public R noTips(@RequestParam("userId") Long userId){ + return userService.noTips(userId); + } + + /** + * 查询社区的收益说明 + * @param communityId 社区id + * @return 收益说明 + */ + @PostMapping("listagreements") + public R listAgreements(@RequestParam("communityId") Long communityId) { + return userService.listAgreements(communityId); + } + + @PostMapping("user/getUserGrids") + public R getGridIsOk(@RequestParam("userId") Long userId) { + return userService.getGridIsOk(userId); + } + + @GetMapping("getGridsMemberList") + public R getGridsMemberList(@RequestParam("communityId") Long communityId) { + return userService.getGridsMemberList(communityId); + } } -- Gitblit v1.7.1