huanghongfa
2021-05-08 554e8aaef09ad38484ea043ab56405bbfea36c80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
@@ -146,7 +146,7 @@
    }
    @Override
    public R getComCvtBusiness(Long id, String cityCode) {
    public R getComCvtBusiness(Long id) {
        ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id);
        if (null == comCvtBusinessDO) {
            return R.fail("商家不存在");
@@ -157,18 +157,11 @@
        if(comCvtBusinessDO.getAreaFlag()==1){
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
            if(!StringUtils.isEmpty(cityCode)){
                lambdaQueryWrapper.eq(ComActDO::getCityCode, cityCode);
            }
            comActDOS = comActDAO.selectList(lambdaQueryWrapper);
        }else{
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            if(!ObjectUtils.isEmpty(areaIds)){
                List<ComActDO> busiDO = comActDAO.selectBatchIds(areaIds);
                if(!StringUtils.isEmpty(cityCode) && busiDO!=null && busiDO.size()>0){
                    comActDOS = busiDO.stream().filter(comActDO -> cityCode.equals(comActDO.getCityCode()))
                            .collect(Collectors.toList());
                }
            }
        }