From 50869dd1a017c3502e3d170ba7a33101c4d0a9c8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 七月 2021 09:49:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 08a711a..65b5fed 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
@@ -11,12 +11,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
-import com.panzhihua.common.model.vos.community.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.PageComActMessageVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -67,10 +62,10 @@
@PostMapping("easyphoto")
public R addEasyPhoto (@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO){
// 微信内容审核
- String msg = comActEasyPhotoVO.getDetail();
- if (!checkService.checkMessage(msg)) {
- return R.fail("内容违规");
- }
+// String msg = comActEasyPhotoVO.getDetail();
+// if (!checkService.checkMessage(msg)) {
+// return R.fail("内容违规");
+// }
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
if (null==communityId||0==communityId) {
@@ -81,6 +76,13 @@
comActEasyPhotoVO.setSponsorId(userId);
comActEasyPhotoVO.setStatus(1);
return communityService.addEasyPhoto(comActEasyPhotoVO);
+ }
+
+ @ApiOperation(value = "查询随手拍是否有活动",response = ComActEasyPhotoActivityVO.class)
+ @PostMapping("getEasyPhotoActivity")
+ public R getEasyPhotoActivity (){
+ Long communityId = this.getCommunityId();
+ return communityService.getEasyPhotoActivity(communityId);
}
@ApiOperation(value = "随手拍详情",response =ComActEasyPhotoVO.class )
@@ -325,4 +327,16 @@
public R isShop(){
return R.ok(Constants.IS_SHOP_OPEN);
}
+
+ @ApiOperation(value = "获取最新活动和用户最新收益",response =ComActEasyPhotoRewardVO.class )
+ @PostMapping("getUserReward")
+ public R getUserReward(){
+ return communityService.getUserReward(this.getUserId(),this.getCommunityId());
+ }
+
+ @ApiOperation(value = "读取用户随手拍奖励")
+ @PostMapping("readUserReward")
+ public R readUserReward(){
+ return communityService.readUserReward(this.getUserId(),this.getCommunityId());
+ }
}
--
Gitblit v1.7.1