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

lidongdong

2022-11-10 38596b03540250dd7de85c49f53ece5dd6bfe5b7

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

@@ -65,8 +65,13 @@
    public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
        ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
        BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
        ComActDO comActDO = comActDAO.selectById(convenientElevatingPointDTO.getCommunityId());
        convenientElevatingPointDO.setCommunityName(comActDO.getName());
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            }
        }
        this.baseMapper.insert(convenientElevatingPointDO);
        return R.ok();
    }
@@ -84,13 +89,11 @@
        if (isNull(convenientElevatingPointDO)) {
            return R.fail("自提点不存在");
        }
        Long communityId = convenientElevatingPointDTO.getCommunityId();
        String communityId = convenientElevatingPointDTO.getCommunityId();
        if (nonNull(communityId)) {
            ComActDO comActDO = comActDAO.selectById(communityId);
            ComActDO comActDO = comActDAO.selectById(Long.parseLong(communityId.substring(communityId.lastIndexOf(",")+1)));
            if(comActDO!=null){
                convenientElevatingPointDO.setCommunityName(comActDO.getName());
            } else {
                convenientElevatingPointDO.setCommunityName("西区社区");
            }
        }
        BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);
@@ -111,4 +114,10 @@
        }
        return R.fail("删除失败");
    }

    @Override
    public R detailPoint(Long pointId) {
        ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
        return R.ok(convenientElevatingPointDO);
    }
}