From 07ba29f8b474c102cda0e1e5549b1ca1c90ca16b Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 18:55:35 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 4455ebf..05ccd08 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
@@ -373,8 +373,8 @@
* @return 协议集合
*/
@PostMapping("listagreement")
- public R listAgreement() {
- return userService.listAgreement();
+ public R listAgreement(@RequestParam("communityId") Long communityId) {
+ return userService.listAgreement(communityId);
}
/**
@@ -968,5 +968,34 @@
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