java/zhihuishenqu.git

			@@ -2,9 +2,11 @@

			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;
			import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
			import com.panzhihua.common.model.vos.user.UserPhoneVO;
			import com.panzhihua.common.service.community.CommunityService;
			import com.panzhihua.common.service.partybuilding.PartyBuildingService;
			@@ -17,6 +19,7 @@
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.util.ObjectUtils;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -34,6 +37,7 @@
			* @author: huang.hongfa weixin hhf9596 qq 959656820
			* @create: 2020-11-24 12:03
			**/
			@Slf4j
			@RestController
			@RequestMapping("/user/")
			@Api(tags = {"我的模块"})
			@@ -44,6 +48,8 @@
			private CommunityService communityService;
			@Resource
			private PartyBuildingService partyBuildingService;
			@Resource
			private CheckService checkService;

			@ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
			@GetMapping("info")
			@@ -53,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)) {
			@@ -95,7 +102,26 @@
			public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
			Long userId = this.getUserId();
			loginUserInfoVO.setUserId(userId);
			return userService.putUserAuthentication(loginUserInfoVO);
			R r = userService.putUserAuthentication(loginUserInfoVO);
			if (R.isOk(r)) {
			//通过不发通知
			} else {
			SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
			sysUserNoticeVO.setUserId(userId);
			sysUserNoticeVO.setType(3);
			sysUserNoticeVO.setTitle("实名制审核未通过");
			sysUserNoticeVO.setBusinessType(6);
			// sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
			sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
			// sysUserNoticeVO.setBusinessId(activityId);R
			sysUserNoticeVO.setStatus(0);
			sysUserNoticeVO.setBusinessStatus(1);
			R r1 = userService.addNotice(sysUserNoticeVO);
			if (R.isOk(r1)) {
			log.info("新增实名认证未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
			}
			}
			return r;
			}

			@ApiOperation(value = "修改用户手机号")
			@@ -191,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);
			}

			@@ -198,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 )
			@@ -253,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();