bug修改

101captain

2022-06-06 560db6a1036201e7e2ac50f34ad4a418f17eaba6

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

@@ -6,6 +6,9 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +18,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.constants.NeighborCircleConstants;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
@@ -60,16 +64,33 @@
    private ComActDAO comActDAO;
    @Resource
    private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;

    @Resource
    private ComActNeighborCircleTopicService comActNeighborCircleTopicService;
    @Resource
    private UserService userService;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;
    /**
     * 分页查询邻里圈列表
     * 
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @Override
    public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
//        if(neighborCircleAppDTO.getCommunityId()==0L){
//            R<LoginUserInfoVO> loginUserInfoVOR=userService.getUserInfoByUserId(neighborCircleAppDTO.getUserId().toString());
//            if(R.isOk(loginUserInfoVOR)){
//                LoginUserInfoVO loginUserInfoVO=loginUserInfoVOR.getData();
//                if(loginUserInfoVO!=null){
//                 ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard,loginUserInfoVO.getIdCard()));
//                 if(comPbMemberDO!=null){
//                     neighborCircleAppDTO.setCommunityId(comPbMemberDO.getCommunityId());
//                 }
//                }
//            }
//        }
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        if (!doPager.getRecords().isEmpty()) {
@@ -102,9 +123,46 @@
        return R.ok(doPager);
    }

    @Override
    public R selectSolve(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        IPage<ComActNeighborCircleAppVO> doPager=this.baseMapper.selectSolve(new Page<ComActNeighborCircleDO>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO);
        if (!doPager.getRecords().isEmpty()) {
            for (ComActNeighborCircleAppVO circleAppVO : doPager.getRecords()) {
                if (neighborCircleAppDTO.getSolveId() != null) {
                    // 查询点赞信息
                    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);
                    }
                }
                ComActDO actDO = comActDAO.selectById(circleAppVO.getCommunityId());
                if (circleAppVO.getType() != null && circleAppVO.getType().equals(ComActNeighborCircleDO.type.admin)) {
                    if (actDO != null) {
                        circleAppVO.setName(actDO.getName());
                    }
                }
                else {
                    if (actDO != null) {
                        circleAppVO.setCommunityName(actDO.getName());
                    }
                }

            }
        }
        return R.ok(doPager);
    }

    /**
     * 用户发布邻里圈审核
     * 
     *
     * @param addNeighborCircleAppDTO
     *            邻里圈请求参数
     * @return 发布结果
@@ -123,7 +181,23 @@
        if (StringUtils.isNotEmpty(addNeighborCircleAppDTO.getPhone())) {
            neighborCircleDO.setReleasePhone(addNeighborCircleAppDTO.getPhone());
        }
        if (this.baseMapper.insert(neighborCircleDO) > 0) {
        //判断当前邻里圈是否需要审核
        if(addNeighborCircleAppDTO.getIsExamine().equals(AddComActNeighborCircleAppDTO.isExamine.no)){
            //当邻里圈不需要审核才进入自动审核
            //判断邻里圈自动审核结果
            if(addNeighborCircleAppDTO.getWxExamineResult().equals(AddComActNeighborCircleAppDTO.isExamine.yes)){
                neighborCircleDO.setStatus(ComActNeighborCircleDO.status.xs);
                if(neighborCircleDO.getTopicId() != null){
                    //给邻里圈话题添加邻里圈数量
                    comActNeighborCircleTopicMapper.addCount(neighborCircleDO.getTopicId());
                }
            }else{
                neighborCircleDO.setStatus(ComActNeighborCircleDO.status.bh);
                neighborCircleDO.setRefuseReason("内容违规");
            }
        }

        if(this.baseMapper.insert(neighborCircleDO) > 0){
            return R.ok();
        } else {
            return R.fail("发布失败");
@@ -132,7 +206,7 @@

    /**
     * 查看邻里圈详情
     * 
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈详情
@@ -236,8 +310,10 @@
        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        doPager.getRecords().forEach(data -> {
            if (data.getUserType() != 1) {
                data.setReleaseName(data.getCommunityName());
            if(data.getUserType()!=null){
                if (data.getUserType() != 1) {
                    data.setReleaseName(data.getCommunityName());
                }
            }
        });
        return R.ok(doPager);
@@ -266,6 +342,7 @@
        comActNeighborCircleDO.setLastCommentNum(0);
        comActNeighborCircleDO.setLastFabulousNum(0);
        comActNeighborCircleDO.setLastViewsNum(0);
        comActNeighborCircleDO.setBelongType(addVO.getBelongType());
        this.baseMapper.insert(comActNeighborCircleDO);
        return R.ok();
    }
@@ -281,12 +358,17 @@
            neighborCircleDO.setRefuseReason(editVO.getRefuseReason());
        }
        this.baseMapper.updateById(neighborCircleDO);

        if(editVO.getStatus().equals(EditNeighborCircleAdminVO.status.xs) && neighborCircleDO.getTopicId() != null){
            //给邻里圈话题添加邻里圈数量
            comActNeighborCircleTopicMapper.addCount(neighborCircleDO.getTopicId());
        }
        return R.ok(neighborCircleDO.getReleaseId());
    }

    /**
     * 用户查询邻里圈列表
     * 
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
@@ -295,7 +377,7 @@
    public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
            new Page<>(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()),
            neighborCircleAppDTO.getUserId());
            neighborCircleAppDTO.getUserId(),neighborCircleAppDTO.getBelongType());
        if (!neighborCircleIPage.getRecords().isEmpty()) {
            for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
                // 查询点赞信息
@@ -318,7 +400,7 @@

    /**
     * 邻里圈点赞
     * 
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 点赞结果
@@ -349,7 +431,11 @@
            if (neighborCircleDO != null) {
                neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() + 1);
                neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
                neighborCircleDO.setHotNum(neighborCircleDO.getHotNum() + hotNum);
                this.baseMapper.updateById(neighborCircleDO);
                comActNeighborCircleTopicMapper.addHotNum(neighborCircleDO.getTopicId(),hotNum);
                circleFabulousDO.setCircleId(neighborCircleDO.getId());
            }
            // 添加邻里圈浏览记录
@@ -371,6 +457,10 @@
            if (circleCommentDO != null) {
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
                this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),hotNum);
                this.baseMapper.addHotNum(circleCommentDO.getCircleId(),hotNum);
                circleFabulousDO.setCircleId(circleCommentDO.getCircleId());
            }
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)) {
@@ -389,6 +479,10 @@
            if (circleCommentReplyDO != null) {
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() + 1);
                comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM + NeighborCircleConstants.VIEW_HOT_NUM;
                this.baseMapper.addTopicHotNum(circleCommentReplyDO.getCircleId(),hotNum);
                this.baseMapper.addHotNum(circleCommentReplyDO.getCircleId(),hotNum);
                circleFabulousDO.setCircleId(circleCommentReplyDO.getCircleId());
            }
        }
@@ -401,7 +495,7 @@

    /**
     * 邻里圈转发
     * 
     *
     * @param forwardAppDTO
     *            请求参数
     * @return 转发结果
@@ -419,7 +513,11 @@
            return R.fail("没有找到邻里圈");
        }
        circleDO.setForwardNum(circleDO.getForwardNum() + 1);
        if (this.baseMapper.updateById(circleDO) > 0) {
        if (this.baseMapper.updateById(circleDO) > 0){
            //计算需要增加的热度值
            Long hotNum = NeighborCircleConstants.VIEW_HOT_NUM;
            this.baseMapper.addHotNum(forwardAppDTO.getCircleId(),hotNum);
            this.baseMapper.addTopicHotNum(forwardAppDTO.getCircleId(),hotNum);
            return R.ok();
        } else {
            return R.fail("转发失败");
@@ -428,7 +526,7 @@

    /**
     * 邻里圈评论
     * 
     *
     * @param commentAppDTO
     *            请求参数
     * @return 评论结果
@@ -447,6 +545,11 @@
        neighborCircleDO.setReplyAt(new Date());
        this.baseMapper.updateById(neighborCircleDO);

        //计算需要增加的热度值
        Long hotNum = NeighborCircleConstants.COMMENT_HOT_NUM;
        this.baseMapper.addHotNum(commentAppDTO.getCircleId(),hotNum);
        this.baseMapper.addTopicHotNum(commentAppDTO.getCircleId(),hotNum);

        circleCommentDO.setCircleId(commentAppDTO.getCircleId());
        circleCommentDO.setUserId(commentAppDTO.getUserId());
        circleCommentDO.setUserPhone(commentAppDTO.getPhone());
@@ -464,7 +567,7 @@

    /**
     * 邻里圈回复
     * 
     *
     * @param replyAppDTO
     *            请求参数
     * @return 回复结果
@@ -481,6 +584,11 @@
        neighborCircleDO.setCommentNum(neighborCircleDO.getCommentNum() + 1);
        neighborCircleDO.setReplyAt(new Date());
        this.baseMapper.updateById(neighborCircleDO);

        //计算需要增加的热度值
        Long hotNum = NeighborCircleConstants.COMMENT_HOT_NUM;
        this.baseMapper.addHotNum(replyAppDTO.getCircleId(),hotNum);
        this.baseMapper.addTopicHotNum(replyAppDTO.getCircleId(),hotNum);

        circleCommentReplyDO.setCircleId(replyAppDTO.getCircleId());
        circleCommentReplyDO.setUserId(replyAppDTO.getUserId());
@@ -585,7 +693,8 @@

    @Override
    public R detailNeighborByAdmin(Long id) {
        ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
        ComActNeighborCircleDetailAppVO comActNeighborCircleDO =
                this.baseMapper.neighborDetailByApp(id);
        if (comActNeighborCircleDO == null) {
            return R.fail("id有误");
        }
@@ -593,6 +702,7 @@
        DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
        BeanUtils.copyProperties(comActNeighborCircleDO, vo);
        vo.setReleaseName(user.getName());
        vo.setImageUrl(user.getImageUrl());

        // 查询话题名称
        if (comActNeighborCircleDO.getTopicId() != null) {
@@ -649,6 +759,7 @@
        BeanUtils.copyProperties(commentDO, vo);
        String name = user.getName() == null ? user.getNickName() : user.getName();
        vo.setUserName(name);
        vo.setUserPhone(user.getPhone());
        return R.ok(vo);
    }

@@ -691,12 +802,13 @@

    /**
     * 邻里圈取消点赞
     * 
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return 取消点赞结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO) {
        ComActNeighborCircleFabulousDO circleFabulousDO = null;
        // 查询邻里圈点赞信息
@@ -718,6 +830,10 @@
            if (neighborCircleDO != null) {
                neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() - 1);
                this.baseMapper.updateById(neighborCircleDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
                this.baseMapper.addHotNum(neighborCircleDO.getId(),-hotNum);
                this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),-hotNum);
            }
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)) {
            circleFabulousDO =
@@ -737,6 +853,10 @@
            if (circleCommentDO != null) {
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() - 1);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
                this.baseMapper.addHotNum(circleCommentDO.getCircleId(),-hotNum);
                this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),-hotNum);
            }
        } else if (fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)) {
            circleFabulousDO =
@@ -755,6 +875,10 @@
            if (circleCommentReplyDO != null) {
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() - 1);
                comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
                //计算需要增加的热度值
                Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
                this.baseMapper.addHotNum(circleCommentReplyDO.getCircleId(),-hotNum);
                this.baseMapper.addTopicHotNum(circleCommentReplyDO.getCircleId(),-hotNum);
            }
        }
        if (circleFabulousDO != null) {
@@ -766,7 +890,7 @@

    /**
     * 添加邻里圈浏览记录
     * 
     *
     * @param addBrowseAppDTO
     *            请求参数
     * @return 返回参数
@@ -781,13 +905,18 @@
        if (neighborCircleDO != null) {
            neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1);
            this.baseMapper.updateById(neighborCircleDO);

            //计算需要增加的热度值
            Long hotNum = NeighborCircleConstants.FABULOUS_HOT_NUM;
            this.baseMapper.addHotNum(neighborCircleDO.getId(),hotNum);
            this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),hotNum);
        }
        return R.ok();
    }

    /**
     * 分页查询评论下所有回复
     * 
     *
     * @param commentReplyAppDTO
     *            请求参数
     * @return 回复列表
@@ -818,4 +947,33 @@
        }
        return R.ok(neighborCircleIPage);
    }

    /**
     * 小程序-删除邻里圈
     * @param circleTopicAppDTO 请求参数
     * @return  删除结果
     */
    @Override
    public R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO){
        ComActNeighborCircleDO neighborCircleDO = new ComActNeighborCircleDO();
        neighborCircleDO.setId(circleTopicAppDTO.getId());
        neighborCircleDO.setIsDel(ComActNeighborCircleDO.isDel.yes);
        if(this.baseMapper.updateById(neighborCircleDO) > 0){
            return R.ok();
        }
        return R.fail();
    }

    @Override
    public R orderAndSolve(EditNeighborCircleAdminVO editNeighborCircleAdminVO) {
        ComActNeighborCircleDO comActNeighborCircleDO=new ComActNeighborCircleDO();
        BeanUtils.copyProperties(editNeighborCircleAdminVO,comActNeighborCircleDO);
        if(comActNeighborCircleDO.getSolveStatus()!=null){
            comActNeighborCircleDO.setSolveTime(new Date());
        }
        if(comActNeighborCircleDO.getOrderStatus()!=null){
            comActNeighborCircleDO.setOrderTime(new Date());
        }
        return R.ok(this.baseMapper.updateById(comActNeighborCircleDO));
    }
}