From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 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..a4b315c 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
@@ -1,13 +1,16 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.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,10 +23,13 @@
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.boot.util.LambdaSafe;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -49,6 +55,8 @@
private ComCvtBusinessAreaService comCvtBusinessAreaService;
@Resource
private ComCvtBusinessIntroduceService comCvtBusinessIntroduceService;
+ @Resource
+ private ComCvtServeService comCvtServeService;
@Resource
private ComActDAO comActDAO;
@@ -145,9 +153,18 @@
}
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<ComActDO> comActDOS = comActDAO.selectBatchIds(areaIds);
+ List<ComActDO> comActDOS = new ArrayList<>();
+
+ if(comCvtBusinessDO.getAreaFlag()==1){
+ LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
+ comActDOS = comActDAO.selectList(lambdaQueryWrapper);
+ }else{
+ List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
+ if(!ObjectUtils.isEmpty(areaIds)){
+ comActDOS = comActDAO.selectBatchIds(areaIds);
+ }
+ }
+
if (!ObjectUtils.isEmpty(comActDOS)) {
List<ComActVO> comActVOS = new ArrayList<>();
comActDOS.forEach(comActDO -> {
@@ -157,14 +174,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 +192,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