From bc796a0a155341f25b889dec7019df27a36b031c Mon Sep 17 00:00:00 2001 From: Null <281575458@qq.com> Date: 星期五, 12 三月 2021 15:49:51 +0800 Subject: [PATCH] 便民服务 小程序接口 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 10 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java index 31e6427..de32519 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java @@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO; +import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO; import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; +import com.panzhihua.common.model.vos.community.ComCvtBusinessDetailVO; import com.panzhihua.common.model.vos.community.ComCvtBusinessVO; import com.panzhihua.service_community.dao.ComActDAO; import com.panzhihua.service_community.dao.ComCvtBusinessAreaDAO; @@ -20,6 +22,7 @@ import com.panzhihua.service_community.service.ComCvtBusinessAreaService; import com.panzhihua.service_community.service.ComCvtBusinessIntroduceService; import com.panzhihua.service_community.service.ComCvtBusinessService; +import com.panzhihua.service_community.service.ComCvtServeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +52,8 @@ private ComCvtBusinessAreaService comCvtBusinessAreaService; @Resource private ComCvtBusinessIntroduceService comCvtBusinessIntroduceService; + @Resource + private ComCvtServeService comCvtServeService; @Resource private ComActDAO comActDAO; @@ -145,8 +150,7 @@ } ComCvtBusinessVO comCvtBusinessVO = new ComCvtBusinessVO(); BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessVO); - List<ComCvtBusinessAreaDO> comCvtBusinessAreaDOS = comCvtBusinessAreaDAO.selectList(new QueryWrapper<ComCvtBusinessAreaDO>().lambda().eq(ComCvtBusinessAreaDO::getBusinessId, comCvtBusinessDO.getId())); - List<Long> areaIds = comCvtBusinessAreaDOS.stream().map(comCvtBusinessAreaDO -> comCvtBusinessAreaDO.getCommunityId()).collect(Collectors.toList()); + List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId()); List<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds); if (!ObjectUtils.isEmpty(comActDOS)) { List<ComActVO> comActVOS = new ArrayList<>(); @@ -157,14 +161,8 @@ }); comCvtBusinessVO.setComActVOS(comActVOS); } - List<ComCvtBusinessIntroduceDO> comCvtBusinessIntroduceDOS = comCvtBusinessIntroduceDAO.selectList(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, comCvtBusinessDO.getId())); - if (!ObjectUtils.isEmpty(comCvtBusinessIntroduceDOS)) { - List<String> mediaPaths = new ArrayList<>(); - comCvtBusinessIntroduceDOS.forEach(media -> { - mediaPaths.add(media.getMediaPath()); - }); - comCvtBusinessVO.setMediaPaths(mediaPaths); - } + List<String> mediaPaths = comCvtBusinessIntroduceService.getBusinessMediaPaths(id); + comCvtBusinessVO.setMediaPaths(mediaPaths); return R.ok(comCvtBusinessVO); } @@ -181,4 +179,46 @@ comCvtBusinessIntroduceDAO.delete(new QueryWrapper<ComCvtBusinessIntroduceDO>().lambda().eq(ComCvtBusinessIntroduceDO::getBusinessId, id)); return R.ok(); } + + @Override + public R pageComCvtBusinessByServiceArea(PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) { + Page page = new Page<>(); + Long pageNum = comCvtBusinessAppletsDTO.getPageNum(); + Long pageSize = comCvtBusinessAppletsDTO.getPageSize(); + if (null == pageNum || 0 == pageNum) { + pageNum = 1l; + } + if (null == pageSize || 0 == pageSize) { + pageSize = 10l; + } + page.setSize(pageSize); + page.setCurrent(pageNum); + IPage<ComCvtBusinessVO> iPage = comCvtBusinessDAO.pageComCvtBusinessByServiceArea(page, comCvtBusinessAppletsDTO); + return R.ok(iPage); + } + + @Override + public R getComCvtBusinessServeDetail(Long id) { + ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id); + if (null == comCvtBusinessDO) { + return R.fail("商家不存在"); + } + ComCvtBusinessDetailVO comCvtBusinessDetailVO = new ComCvtBusinessDetailVO(); + BeanUtils.copyProperties(comCvtBusinessDO, comCvtBusinessDetailVO); + if(comCvtBusinessDO.getAreaFlag()!=1){ + List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId()); + List<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds); + if (!ObjectUtils.isEmpty(comActDOS)) { + List<String> comActVOS = new ArrayList<>(); + comActDOS.forEach(comActDO -> { + comActVOS.add(comActDO.getName()); + }); + comCvtBusinessDetailVO.setComActVOS(comActVOS); + } + } + List<String> mediaPaths = comCvtBusinessIntroduceService.getBusinessMediaPaths(id); + comCvtBusinessDetailVO.setMediaPaths(mediaPaths); + comCvtBusinessDetailVO.setCategoryServeVOS(comCvtServeService.getBusinessCategoryServeVOS(id)); + return R.ok(comCvtBusinessDetailVO); + } } -- Gitblit v1.7.1