From 543aecbc143b113e81c887a3a7ebb72213faf5bd Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 25 五月 2021 14:21:12 +0800
Subject: [PATCH] Merge branch 'test' into 'lyq'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 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 fbafe58..1f2ef9f 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
@@ -9,6 +9,7 @@
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.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -166,6 +167,15 @@
@PostMapping("putuserisvolunteer")
R putUserIsVolunteer(@RequestParam("phone") String phone,@RequestParam("type")int type);
+
+ /**
+ * 修改用户志愿者状态
+ * @param userId 用户ID
+ * @param type 1 支援者 0不是志愿者
+ */
+ @PostMapping("putuserisvolunteerbyid")
+ R putUserIsVolunteerById(@RequestParam("userId") Long userId,@RequestParam("type")int type);
+
/**
* 用户绑定社区、小区
* @param loginUserInfoVO 社区小区数据
@@ -204,7 +214,9 @@
* @return 成员集合
*/
@PostMapping("listfamily")
- R listFamily(@RequestParam("userId")Long userId);
+ R listFamily(@RequestParam("userId")Long userId,
+ @RequestParam(value = "pageNum") Long pageNum,
+ @RequestParam("pageSize") Long pageSize);
/**
* 新增家庭成员
@@ -466,6 +478,13 @@
*/
@PostMapping("updateuserispartymember")
R updateUserIsPartymember(@RequestParam("idCard")String idCard);
+ /**
+ * 修改用户的为非党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateusernotpartymember")
+ R updateUserNotPartymember(@RequestParam("idCard")String idCard);
/**
* 获取角色的权限配置列表
@@ -546,7 +565,7 @@
* @return
*/
@GetMapping("getUserByAccount")
- R getSysUserVOByAccount(@RequestParam(value = "account") String account);
+ R getSysUserVOByAccountAndType(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type);
/**
@@ -612,7 +631,7 @@
* @return
*/
@PostMapping("common/data/special/tags/page")
- R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO);
+ R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);
/**
* 新增或修改特殊群体标签
@@ -644,4 +663,44 @@
*/
@PostMapping("listtag/getTag")
R listTags(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 添加SysUser信息
+ * @param storeVO sysUser信息
+ * @return 添加sysUser结果
+ */
+ @PostMapping("addSysUser")
+ R addSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改SysUser信息
+ * @param storeVO sysUser信息
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ R editSysUser(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
+
+ /**
+ * 获取用户电子档案
+ * @param userId 家庭成员信息
+ * @return 结果
+ */
+ @GetMapping("getUserArchives")
+ R getUserArchives(@RequestParam("userId") Long userId);
+
+ /**
+ * 编辑用户电子档案
+ * @param userArchivesVO 编辑的信息
+ * @return 编辑结果
+ */
+ @PostMapping("updateUserArchives")
+ R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO);
}
--
Gitblit v1.7.1