From a8ba074e4b0807cee707614a55e31e34ea0fbbde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 10:29:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 82 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 3 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 2221c35..8d613da 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,8 +2,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.applets.model.dtos.ComPbMemberCertificationDTO;
+import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
@@ -11,7 +15,6 @@
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.exceptions.UnAuthenticationException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.validated.AddGroup;
@@ -19,6 +22,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +51,8 @@
private CommunityService communityService;
@Resource
private PartyBuildingService partyBuildingService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
@GetMapping("info")
@@ -56,6 +62,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)) {
@@ -140,6 +147,17 @@
return userService.putUser(loginUserInfoVO);
}
+ @ApiOperation(value = "修改用户首页活动提示")
+ @PostMapping("editUserTips")
+ public R putUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
+ Long userId = this.getUserId();
+ if(userId == null){
+ return R.fail("请重新登录");
+ }
+ userEditTipsDTO.setUserId(userId);
+ return userService.editUserTips(userEditTipsDTO);
+ }
+
@ApiOperation(value = "房屋地址下拉列表")
@GetMapping("listhouse")
@ApiImplicitParam(name = "parentCode",value = "父级地址编码",required = false)
@@ -213,6 +231,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);
}
@@ -221,9 +243,7 @@
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
Long userId = this.getUserId();
comActEasyPhotoVO.setSponsorId(userId);
- comActEasyPhotoVO.setLogInUserId(userId);
comActEasyPhotoVO.setCommunityId(null);
-// return communityService.pageEasyPhoto(comActEasyPhotoVO);
return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
@@ -276,6 +296,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();
@@ -289,5 +314,56 @@
return userService.addFeedback(sysUserFeedbackDTO);
}
+ @ApiOperation(value = "党员认证" )
+ @PostMapping("partybuildingembercertification")
+ public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
+ //totest 党员认证
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null==communityId||0==communityId) {
+ return R.fail("未绑定社区");
+ }
+
+ //判断用户是否已认证成功
+ R certUser = partyBuildingService.userCertification(userId);
+
+ Object certUserInfo = certUser.getData();
+ boolean userCertified = false;
+ if(certUserInfo!=null){
+ PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
+ //已认证党员身份，直接返回
+ userCertified = certUserVo.getAuditResult()==1;
+ }
+ //匹配手机，验证是否进行自动确认
+ if(userCertified){
+ return R.fail("用户已完成党员认证");
+ }
+
+ PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
+ BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO);
+
+ //用户实名认证信息判断
+ String idCard = loginUserInfo.getIdCard();
+ partyBuildingMemberVO.setUserId(userId);
+ if(idCard==null) {
+ return R.fail("用户未完成实名认证");
+ }else{
+ partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
+ partyBuildingMemberVO.setName(loginUserInfo.getName());
+ }
+
+ R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
+ return r;
+ }
+
+ @ApiOperation(value = "党员认证查询" )
+ @GetMapping("partybuildingembercertification")
+ public R partybuildingembercertification() {
+ //totest 党员认证查询
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ return partyBuildingService.userCertification(userId);
+ }
}
--
Gitblit v1.7.1