java/zhihuishenqu.git

			@@ -6,12 +6,14 @@
			import java.util.Comparator;
			import java.util.Date;
			import java.util.List;
			import java.util.Objects;
			import java.util.Optional;
			import java.util.concurrent.atomic.AtomicBoolean;
			import java.util.stream.Collectors;

			import javax.annotation.Resource;

			import com.panzhihua.common.constants.HttpStatus;
			import org.apache.commons.lang.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.data.redis.core.StringRedisTemplate;
			@@ -96,6 +98,10 @@
			Object data = r.getData();
			if (!ObjectUtils.isEmpty(data)) {
			LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
			//是否保存unionid
			// if (Objects.isNull(loginUserInfoVO.getUnionid()) \|\| "无".equals(loginUserInfoVO.getUnionid())) {
			// return R.fail(HttpStatus.UNAUTHORIZED, "token过期");
			// }
			R r1 = communityService.detailHouse(userId);
			if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
			//查询实名用户绑定的实有人口地址
			@@ -147,6 +153,7 @@
			public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
			Long userId = this.getUserId();
			loginUserInfoVO.setUserId(userId);
			loginUserInfoVO.setCommunityId(this.getCommunityId());
			R r = userService.putUserAuthentication(loginUserInfoVO);
			if (R.isOk(r)) {
			// 通过发通知
			@@ -262,22 +269,21 @@
			}

			@ApiOperation(value = "我的活动", response = ComActActivityVO.class)
			@ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
			@GetMapping("listactivity")
			public R listActivity(@RequestParam("status") Integer status) {
			public R listActivity(@RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
			LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
			Long userId = loginUserInfo.getUserId();
			Long communityId = loginUserInfo.getCommunityId();
			List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
			R r = communityService.listActivity(userId);
			if (R.isOk(r)) {
			R r = communityService.listActivity(userId, status,type);
			if (R.isOk(r)&&r.getData()!=null) {
			comActActivityVOS = (List<ComActActivityVO>)r.getData();
			}
			R r1 = partyBuildingService.listActivity(userId, communityId, status);
			if (R.isOk(r1)) {
			List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
			comActActivityVOS.addAll(data);
			}
			// R r1 = partyBuildingService.listActivity(userId, communityId, status);
			// if (R.isOk(r1)&&r1.getData()!=null) {
			// List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
			// comActActivityVOS.addAll(data);
			// }
			if (!ObjectUtils.isEmpty(comActActivityVOS)) {
			String s = JSONArray.toJSONString(comActActivityVOS);
			List<ComActActivityVO> comActActivityVOS1 = new ArrayList<>();
			@@ -299,6 +305,30 @@
			comActActRegistVOS.forEach(activitySignInVO -> {
			if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
			currentList.add(activitySignInVO);
			if(comActActivityVO.getType()!=3){
			comActActivityVO.setIsComment(1);
			if(comActActivityVO.getTimes()==null){
			comActActivityVO.setTimes(1);
			comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
			}
			else {
			comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
			comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
			}
			}
			else {
			if(activitySignInVO.getEndTime()!=null){
			comActActivityVO.setIsComment(1);
			if(comActActivityVO.getTimes()==null){
			comActActivityVO.setTimes(1);
			comActActivityVO.setAward(comActActivityVO.getRewardIntegral());
			}
			else {
			comActActivityVO.setTimes(comActActivityVO.getTimes()+1);
			comActActivityVO.setAward(comActActivityVO.getRewardIntegral()*comActActivityVO.getTimes());
			}
			}
			}
			}
			});
			if (currentList.size() > 10) {
			@@ -306,17 +336,32 @@
			} else {
			comActActivityVO.setActivitySignInList(currentList);
			}
			Integer limit = comActActivityVO.getLimit();
			if(limit != null && limit>0 &&currentList.size()>0){
			if(comActActivityVO.getType()==3){
			if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
			comActActivityVO.setIsRegist(1);
			}
			}
			else {
			if(limit==currentList.size()){
			comActActivityVO.setIsRegist(1);
			}
			}
			}
			});
			}
			//当前用户活动评分
			R r3 = communityService.listEvaluate(userId);
			if (R.isOk(r3) && !ObjectUtils.isEmpty(r3.getData())) {
			List<ComActActEvaluateVO> comActActEvaluateVOS = JSONArray.parseArray(JSONArray.toJSONString(r3.getData()), ComActActEvaluateVO.class);
			collect.forEach(comActActivityVO -> comActActEvaluateVOS.forEach(comActActEvaluateVO -> {
			if (comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())) {
			comActActivityVO.setMyRating(comActActEvaluateVO.getStarLevel());
			}
			}));
			collect.forEach(comActActivityVO -> {
			List<ComActActEvaluateVO> evaluateVOS=comActActEvaluateVOS.stream().filter(comActActEvaluateVO -> comActActEvaluateVO.getActivityId().equals(comActActivityVO.getId())).collect(toList());
			if(comActActivityVO.getSignCount()<=evaluateVOS.size()){
			comActActivityVO.setIsComment(0);
			}
			comActActivityVO.setComActActEvaluateVOList(evaluateVOS);
			});
			}
			return R.ok(collect);
			}
			@@ -408,7 +453,7 @@
			}

			// 判断用户是否已认证成功
			R certUser = partyBuildingService.userCertification(userId);
			R certUser = partyBuildingService.userCertification(userId,communityId);

			Object certUserInfo = certUser.getData();
			AtomicBoolean userCertified = new AtomicBoolean(false);
			@@ -443,6 +488,7 @@
			} else {
			partyBuildingMemberVO.setIdCard(loginUserInfo.getIdCard());
			partyBuildingMemberVO.setName(loginUserInfo.getName());
			partyBuildingMemberVO.setPhone(loginUserInfo.getPhone());
			}

			R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
			@@ -455,7 +501,7 @@
			// 党员认证查询
			LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
			Long userId = loginUserInfo.getUserId();
			R r = partyBuildingService.userCertification(userId);
			R r = partyBuildingService.userCertification(userId,this.getCommunityId());

			if (R.isOk(r)) {
			List<PartyBuildingMemberVO> partyBuildingMemberVOList =