From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 6e4d83e..a72b16e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -4,6 +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.*;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -324,7 +325,7 @@
* @return 协议集合
*/
@PostMapping("listagreement")
- R listAgreement();
+ R listAgreement(@RequestParam("communityId")Long communityId);
/**
* 编辑用户协议
@@ -708,4 +709,63 @@
*/
@PutMapping("updateUserPassByApp")
R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("addGridUser")
+ R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
+
+ /**
+ * 分页查询网格员
+ * @param memberRelationDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("member/list")
+ R getGridMemberList(@RequestBody PageEventGridMemberRelationDTO memberRelationDTO);
+
+ /**
+ * 修改网格员信息
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editGridUser")
+ R editGridUser(@RequestBody EventGridMemberEditAdminDTO eventGridMemberAddDTO);
+
+ /**
+ * 重置网格员密码
+ * @param gridMemberDTO 请求参数
+ * @return 重置结果
+ */
+ @PostMapping("passResetUser")
+ R gridMemberPassReset(@RequestBody EventGridMemberPassResetDTO gridMemberDTO);
+
+ /**
+ * 批量删除网格员
+ * @param Ids 网格员id集合
+ * @return 删除结果
+ */
+ @PostMapping("deleteMembers")
+ R deleteMembers(@RequestBody List<Long> Ids);
+
+ /**
+ * 批量修改网格员状态
+ * @param gridMemberEditDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("gridMemberEditStatus")
+ R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ @GetMapping("big/no/tip")
+ R noTips(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询社区的收益说明
+ * @param communityId 社区id
+ * @return 收益说明
+ */
+ @PostMapping("listagreements")
+ R listAgreements(@RequestParam("communityId")Long communityId);
}
--
Gitblit v1.7.1