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/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 9e5f7eb..09910e3 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
@@ -325,7 +325,7 @@
* @return 协议集合
*/
@PostMapping("listagreement")
- R listAgreement();
+ R listAgreement(@RequestParam("communityId")Long communityId);
/**
* 编辑用户协议
@@ -620,7 +620,7 @@
* @param id
* @return
*/
- @DeleteMapping("common/data/special/delete")
+ @DeleteMapping("common/data/special/delete1")
R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
/**
@@ -760,4 +760,26 @@
@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);
+
+ /**
+ * 根据用户id查询用户openid
+ * @param userId 用户id
+ * @return openid
+ */
+ @GetMapping("getUserOpenId")
+ R getUserOpenId(@RequestParam("userId")Long userId);
}
--
Gitblit v1.7.1