From b69bc7c024582dadf34f88e43ff0bcc0f8e07f9f Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 20:01:13 +0800
Subject: [PATCH] 特殊群体标签重复bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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..86520d3 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,15 +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.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;
-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 com.panzhihua.common.utlis.ClazzUtils;
@@ -152,12 +146,12 @@
/**
* 分页查询人口管理
*
- * @param loginUserInfoVO 查询参数
+ * @param userInfoVO 查询参数
* @return 分页数据
*/
@PostMapping("pageuser")
- public R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO) {
- return userService.pageUser(loginUserInfoVO);
+ public R pageUser(@RequestBody AppletUserInfoVO userInfoVO) {
+ return userService.pageUser(userInfoVO);
}
/**
@@ -376,8 +370,8 @@
* @return 协议集合
*/
@PostMapping("listagreement")
- public R listAgreement() {
- return userService.listAgreement();
+ public R listAgreement(@RequestParam("communityId") Long communityId) {
+ return userService.listAgreement(communityId);
}
/**
@@ -937,7 +931,7 @@
* @return 修改结果
*/
@PostMapping("editGridUser")
- public R gridMemberEdit(@RequestBody EventGridMemberAddDTO gridMemberDTO){
+ public R gridMemberEdit(@RequestBody EventGridMemberEditAdminDTO gridMemberDTO){
return userService.editGridUser(gridMemberDTO);
}
@@ -966,5 +960,39 @@
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);
+ }
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ @GetMapping("getUserOpenId")
+ public R getUserOpenId(@RequestParam("userId")Long userId) {
+ return userService.getUserOpenId(userId);
+ }
}
--
Gitblit v1.7.1