From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 6ecb423..4fc23dd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -111,6 +111,28 @@
         return communityService.detailActivity(id, userId);
     }
 
+    @ApiOperation(value = "分页查询活动评价记录", response = ComActActEvaluateVO.class)
+    @PostMapping("evaluate/page")
+    public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+        return communityService.pageActivityEvaluates(comActActEvaluateVO);
+    }
+
+    @ApiOperation(value = "社区活动/志愿者活动签到")
+    @PostMapping("activity/sign-in")
+    public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
+        comActActRegistVO.setUserId(this.getUserId());
+        return communityService.activitySignIn(comActActRegistVO);
+    }
+
+    @ApiOperation(value = "社区活动/志愿者活动评价")
+    @PostMapping("activity/evaluate")
+    public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+        comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
+        comActActEvaluateVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
+        return communityService.activityEvaluate(comActActEvaluateVO);
+    }
+
     @ApiOperation(value = "报名/取消报名社区活动")
     @PutMapping("signactivity")
     public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {

--
Gitblit v1.7.1