From a2484b2ba1d7cc230f73bd013477d329e4faed6b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 08 九月 2021 14:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 1cb382a..b4fa65d 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,17 +111,27 @@
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());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActRegistVO.setUserId(loginUserInfo.getUserId());
+ comActActRegistVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
return communityService.activitySignIn(comActActRegistVO);
}
@ApiOperation(value = "社区活动/志愿者活动评价")
@PostMapping("activity/evaluate")
public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
- comActActEvaluateVO.setUserId(this.getUserId());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ comActActEvaluateVO.setUserId(loginUserInfo.getUserId());
+ comActActEvaluateVO.setIsVolunteer(loginUserInfo.getIsVolunteer());
return communityService.activityEvaluate(comActActEvaluateVO);
}
--
Gitblit v1.7.1