java/zhihuishenqu.git

			@@ -95,7 +95,7 @@
			circleAppVO.setHaveSign(2);
			}

			if(circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
			if(circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
			ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
			if(actDO != null){
			circleAppVO.setName(actDO.getName());
			@@ -147,7 +147,7 @@
			return R.fail("未找到邻里圈信息");
			}

			if(circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
			if(circleDetailAppVO.getType() != null && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
			ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
			if(actDO != null){
			circleDetailAppVO.setName(actDO.getName());
			@@ -239,7 +239,7 @@
			comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent());
			comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages());
			comActNeighborCircleDO.setType(2);
			comActNeighborCircleDO.setStatus(1);
			comActNeighborCircleDO.setStatus(2);
			comActNeighborCircleDO.setCommentNum(0);
			comActNeighborCircleDO.setFabulousNum(0);
			comActNeighborCircleDO.setForwardNum(0);
			@@ -276,6 +276,21 @@
			public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
			IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
			new Page<>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getUserId());
			if(!neighborCircleIPage.getRecords().isEmpty()) {
			for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
			//查询点赞信息
			ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
			new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
			.eq(ComActNeighborCircleFabulousDO::getUserId, neighborCircleAppDTO.getUserId())
			.eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborCircleFabulousDO.type.llq)
			.eq(ComActNeighborCircleFabulousDO::getIsEffective, ComActNeighborCircleFabulousDO.isEffective.yes));
			if (circleFabulousDO != null) {
			circleAppVO.setHaveSign(1);
			} else {
			circleAppVO.setHaveSign(2);
			}
			}
			}
			return R.ok(neighborCircleIPage);
			}

			@@ -298,7 +313,8 @@
			ComActNeighborCircleFabulousDO oldCircleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
			new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborFabulousAppDTO.type.llq)
			.eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
			.eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
			.eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes)
			.eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()));
			if(oldCircleFabulousDO != null){
			return R.fail("您已点赞");
			}
			@@ -553,6 +569,17 @@
			}
			commentDO.setStatus(dto.getStatus());
			neighborCircleCommentDAO.updateById(commentDO);

			//查询邻里圈更新邻里圈评论数量
			ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(commentDO.getCircleId());
			if(neighborCircleDO != null){
			if(dto.getStatus().equals(2)){
			neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() - 1);
			}else{
			neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
			}
			this.baseMapper.updateById(neighborCircleDO);
			}
			return R.ok();
			}

			@@ -565,7 +592,8 @@
			AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
			ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
			BeanUtils.copyProperties(commentDO,vo);
			vo.setUserName(user.getName());
			String name = user.getName()==null?user.getNickName():user.getName();
			vo.setUserName(name);
			return R.ok(vo);
			}