From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index c65baa9..050c5d4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -342,9 +342,15 @@
}
@ApiOperation(value = "获取最新活动和用户最新收益",response =ComActEasyPhotoRewardVO.class )
- @PostMapping("getUserReward")
- public R getUserReward(){
- return communityService.getUserReward(this.getUserId(),this.getCommunityId());
+ @GetMapping("getUserReward")
+ public R getUserReward(@RequestParam("communityId") Long communityId){
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getUserReward(userId,communityId);
}
@ApiOperation(value = "读取用户随手拍奖励")
--
Gitblit v1.7.1