From 503135f1f8a7cfed29cac1786a6a7c8758eed8d3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 16 七月 2021 10:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   18 ++++++++++++++++--
 1 files changed, 16 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..81f2324 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,19 @@
         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);
+    }
 
 }

--
Gitblit v1.7.1