Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-08 e37e7842a5019c64af9213fb763ea322530ac704

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -69,6 +69,8 @@
    private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO;
    @Resource
    private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
    @Resource
    private ComActDAO comActDAO;

    /**
     * 分页查询邻里圈列表
@@ -92,6 +94,14 @@
                }else{
                    circleAppVO.setHaveSign(2);
                }

                if(circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
                    ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                    if(actDO != null){
                        circleAppVO.setName(actDO.getName());
                    }
                }

            }
        }
        return R.ok(doPager);
@@ -137,6 +147,13 @@
            return R.fail("未找到邻里圈信息");
        }

        if(circleDetailAppVO.getType() != null && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
            ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
            if(actDO != null){
                circleDetailAppVO.setName(actDO.getName());
            }
        }

        //查询邻里圈点赞信息
        ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
@@ -171,6 +188,9 @@
                    List<ComActNeighborCircleCommentReplyAppVO> newCommentReplyAppVOS = new ArrayList<>();
                    int i = 0;
                    for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) {
                        if(i >= 2){
                            break;
                        }
                        //查询点赞信息
                        ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                                new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
@@ -181,9 +201,6 @@
                            commentReplyVO.setHaveSign(1);
                        }else{
                            commentReplyVO.setHaveSign(2);
                        }
                        if(i >= 2){
                            break;
                        }
                        newCommentReplyAppVOS.add(commentReplyVO);
                        i++;
@@ -221,7 +238,8 @@
        comActNeighborCircleDO.setCommunityId(adminUser.getCommunityId());
        comActNeighborCircleDO.setReleaseContent(addVO.getReleaseContent());
        comActNeighborCircleDO.setReleaseImages(addVO.getReleaseImages());
        comActNeighborCircleDO.setStatus(1);
        comActNeighborCircleDO.setType(2);
        comActNeighborCircleDO.setStatus(2);
        comActNeighborCircleDO.setCommentNum(0);
        comActNeighborCircleDO.setFabulousNum(0);
        comActNeighborCircleDO.setForwardNum(0);
@@ -246,7 +264,7 @@
            neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
        }
        this.baseMapper.updateById(neighborCircleDO);
        return R.ok();
        return R.ok(neighborCircleDO.getReleaseId());
    }

    /**
@@ -685,8 +703,9 @@
                ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                        new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyAppVO.getId())
                                .eq(ComActNeighborCircleFabulousDO::getUserId,commentReplyAppDTO.getUserId())
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf));
                if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
                                .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                if(circleFabulousDO != null){
                    commentReplyAppVO.setHaveSign(1);
                }else{
                    commentReplyAppVO.setHaveSign(2);