| | |
| | | } |
| | | |
| | | @Override |
| | | public R getComCvtBusiness(Long id, String cityCode) { |
| | | public R getComCvtBusiness(Long id) { |
| | | ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id); |
| | | if (null == comCvtBusinessDO) { |
| | | return R.fail("商家不存在"); |
| | |
| | | |
| | | 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()); |
| | | } |
| | | } |
| | | } |
| | | |