From eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 09:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 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 7362300..14fa1be 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
@@ -5,6 +5,9 @@
 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.user.*;
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -717,4 +720,44 @@
      */
     @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 EventGridMemberAddDTO 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);
 }

--
Gitblit v1.7.1