From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index fcf7176..54fc5ab 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
@@ -47,6 +48,8 @@
private CommunityService communityService;
@Resource
private PartyBuildingService partyBuildingService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
@GetMapping("info")
@@ -56,6 +59,7 @@
Long userId = loginUserInfo.getUserId();
Long areaId = loginUserInfo.getAreaId();
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
+ String phone = loginUserInfo.getPhone();
if (R.isOk(r)) {
Object data = r.getData();
if (!ObjectUtils.isEmpty(data)) {
@@ -109,7 +113,7 @@
sysUserNoticeVO.setBusinessType(6);
// sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
-// sysUserNoticeVO.setBusinessId(activityId);
+// sysUserNoticeVO.setBusinessId(activityId);R
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(1);
R r1 = userService.addNotice(sysUserNoticeVO);
@@ -213,6 +217,10 @@
List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
comActActivityVOS=collect;
}
+ if (!ObjectUtils.isEmpty(comActActivityVOS)) {
+ List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
+ return R.ok(collect);
+ }
return R.ok(comActActivityVOS);
}
@@ -220,10 +228,9 @@
@PostMapping("pageeasyphoto")
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
Long userId = this.getUserId();
- comActEasyPhotoVO.setUserId(userId);
- comActEasyPhotoVO.setLogInUserId(userId);
+ comActEasyPhotoVO.setSponsorId(userId);
comActEasyPhotoVO.setCommunityId(null);
- return communityService.pageEasyPhoto(comActEasyPhotoVO);
+ return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
@ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
@@ -275,6 +282,11 @@
@ApiOperation(value = "意见反馈" )
@PostMapping("feedback")
public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) {
+ // 微信内容审核
+ String msg = sysUserFeedbackDTO.getContent();
+ if (!checkService.checkMessage(msg)) {
+ return R.fail("内容违规");
+ }
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
--
Gitblit v1.7.1