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

huanghongfa

2021-05-08 554e8aaef09ad38484ea043ab56405bbfea36c80

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

@@ -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);
@@ -553,6 +553,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 if(dto.getStatus().equals(1)){
                neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
            }
            this.baseMapper.updateById(neighborCircleDO);
        }
        return R.ok();
    }