From df1de6a8ca9bf6af14d858fb51d077c00dd2dd48 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 七月 2021 13:08:41 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   90 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 6 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 28332d6..23da2ed 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,11 +4,9 @@
 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.LoginUserInfoVO;
-import com.panzhihua.common.model.vos.MenuVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.*;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -327,7 +325,7 @@
      * @return 协议集合
      */
     @PostMapping("listagreement")
-    R listAgreement();
+    R listAgreement(@RequestParam("communityId")Long communityId);
 
     /**
      * 编辑用户协议
@@ -478,6 +476,13 @@
      */
     @PostMapping("updateuserispartymember")
     R updateUserIsPartymember(@RequestParam("idCard")String idCard);
+    /**
+     * 修改用户的为非党员状态
+     * @param idCard 身份证号
+     * @return 修改结果
+     */
+    @PostMapping("updateusernotpartymember")
+    R updateUserNotPartymember(@RequestParam("idCard")String idCard);
 
     /**
      * 获取角色的权限配置列表
@@ -615,7 +620,7 @@
      * @param id
      * @return
      */
-    @DeleteMapping("common/data/special/delete")
+    @DeleteMapping("common/data/special/delete1")
     R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
 
     /**
@@ -696,4 +701,77 @@
      */
     @PostMapping("updateUserArchives")
     R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO);
+
+    /**
+     * 修改app用户密码
+     * @param userInfoAppDTO    请求参数
+     * @return  修改结果
+     */
+    @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);
+
+    @PostMapping("user/getUserGrids")
+    R getGridIsOk(@RequestParam("userId")Long userId);
+
+    @GetMapping("getGridsMemberList")
+    R getGridsMemberList(@RequestParam("communityId")Long communityId);
 }

--
Gitblit v1.7.1