From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 94 ++++++++++++++++++++++++++++++++++------------
1 files changed, 69 insertions(+), 25 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 4222dbb..dbbd2ad 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
@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
@@ -10,10 +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.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+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;
@@ -78,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 )
@@ -238,7 +243,7 @@
return R.fail("用户未绑定社区");
}
Integer type = loginUserInfo.getType();
- if(null==type||type!=1||type!=2) {
+ if(null==type||(type!=1&&type!=2)) {
return R.fail("留言对象类型错误！");
}
Long userId = loginUserInfo.getUserId();
@@ -246,16 +251,41 @@
comActMessageVO.setUserId(userId);
comActMessageVO.setUserName(loginUserInfo.getName());
comActMessageVO.setUserAccount(loginUserInfo.getAccount());
- comActMessageVO.setUserPhone(loginUserInfo.getPhone());
comActMessageVO.setIspublic(1);
comActMessageVO.setStatus(1);
return communityService.addMessage(comActMessageVO);
}
+ @ApiOperation("发布留言回复")
+ @PostMapping("addmessageback")
+ public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO){
+ // 微信内容审核
+ String msg = comActMessageBackVO.getMsgContent();
+ if (!checkService.checkMessage(msg)) {
+ return R.fail("内容违规");
+ }
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null==communityId||0==communityId) {
+ return R.fail("用户未绑定社区");
+ }
+ Integer type = loginUserInfo.getType();
+ if(null==type||(type!=1&&type!=2)) {
+ return R.fail("留言对象类型错误！");
+ }
+ Long userId = loginUserInfo.getUserId();
+ comActMessageBackVO.setCommunityId(communityId);
+ comActMessageBackVO.setUserId(userId);
+ comActMessageBackVO.setUserName(loginUserInfo.getName());
+ comActMessageBackVO.setUserAccount(loginUserInfo.getAccount());
+ comActMessageBackVO.setIspublic(1);
+ comActMessageBackVO.setStatus(1);
+ return communityService.addMessageBack(comActMessageBackVO);
+ }
+
@ApiOperation(value = "分页显示我的留言",response = ComActMessageVO.class)
- @GetMapping("pagemymessage")
- public R pageMyMessage (){
- ComActMessageVO comActMessageVO=new ComActMessageVO();
+ @PostMapping("pagemymessage")
+ public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
if (null==communityId||0==communityId) {
@@ -266,10 +296,9 @@
return communityService.pageMyMessageApplets(comActMessageVO);
}
- @ApiOperation(value = "分页显示给我的留言",response = ComActMessageVO.class)
- @GetMapping("pagesendtomemessage")
- public R pageSendToMessage (){
- ComActMessageVO comActMessageVO=new ComActMessageVO();
+ @ApiOperation(value = "分页显示居民给我的留言",response = ComActMessageVO.class)
+ @PostMapping("pagesendtomemessage")
+ public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
if (null==communityId||0==communityId) {
@@ -277,22 +306,37 @@
}
comActMessageVO.setCommunityId(communityId);
comActMessageVO.setUserId(loginUserInfo.getUserId());
+ comActMessageVO.setPhone(loginUserInfo.getPhone());
return communityService.pageSendToMessageApplets(comActMessageVO);
}
+ @ApiOperation(value = "分页显示指定用户的留言",response =ComActMessageVO.class )
+ @PostMapping("pagemessagebyuser")
+ public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
+ return communityService.pageMessageByUser(comActMessageVO);
+ }
- @ApiOperation(value = "分页显示社区的留言",response = ComActMessageVO.class)
- @GetMapping("pagemycommunitymessage")
- public R pageMyCommunityMessage (){
- ComActMessageVO comActMessageVO=new ComActMessageVO();
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- Long communityId = loginUserInfo.getCommunityId();
- if (null==communityId||0==communityId) {
- return R.fail("用户未绑定社区");
- }
- comActMessageVO.setCommunityId(communityId);
- comActMessageVO.setUserId(loginUserInfo.getUserId());
- return communityService.pageMyCommunityMessageApplets(comActMessageVO);
+ @ApiOperation(value = "留言详情",response =ComActMessageVO.class )
+ @GetMapping("detailmessage")
+ @ApiImplicitParam(name = "id",value = "随手拍主键")
+ public R detailMessage(@RequestParam("id") Long id){
+ return communityService.detailMessage(id);
}
+ @ApiOperation(value = "首页商城开关接口")
+ @GetMapping("isShop")
+ 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