From 61748da73f8b4b2799667864b55554efa0b17aeb Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 14:08:28 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
index 3f5e80c..8a090d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java
@@ -1,33 +1,31 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.convenient.ConvenientElevatingPointDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientElevatingPointDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
-import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ConvenientElevatingPointDAO;
+import com.panzhihua.service_community.dao.ConvenientMerchantDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ConvenientElevatingPointDO;
import com.panzhihua.service_community.model.dos.ConvenientMerchantDO;
-import com.panzhihua.service_community.model.dos.ConvenientServiceCategoryDO;
import com.panzhihua.service_community.service.ConvenientElevatingPointService;
+import com.panzhihua.service_community.util.MapDistance;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
-import java.util.List;
+import java.util.*;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
/**
* @ClassName: ConvenientElevatingPointServiceImpl
@@ -40,9 +38,12 @@
public class ConvenientElevatingPointServiceImpl extends ServiceImpl<ConvenientElevatingPointDAO, ConvenientElevatingPointDO> implements ConvenientElevatingPointService {
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private ConvenientMerchantDAO convenientMerchantDAO;
/**
* 分页查询
+ *
* @param pageConvenientElevatingPointDTO
* @return
*/
@@ -57,40 +58,54 @@
/**
* 新增
+ *
* @param convenientElevatingPointDTO
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R addPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+ ConvenientElevatingPointDO convenientElevatingPointDODB = this.baseMapper.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, convenientElevatingPointDTO.getWechatAccount()));
+ if (!Objects.isNull(convenientElevatingPointDODB)){
+ return R.fail("该微信手机号已使用，请更换");
+ }
ConvenientElevatingPointDO convenientElevatingPointDO = new ConvenientElevatingPointDO();
- BeanUtils.copyProperties(convenientElevatingPointDTO,convenientElevatingPointDO);
- ComActDO comActDO = comActDAO.selectById(convenientElevatingPointDTO.getCommunityId());
- convenientElevatingPointDO.setCommunityName(comActDO.getName());
+ BeanUtils.copyProperties(convenientElevatingPointDTO, convenientElevatingPointDO);
+ 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();
}
/**
* 修改
+ *
* @param convenientElevatingPointDTO
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R putPoint(ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+ ConvenientElevatingPointDO convenientElevatingPointDODB = this.baseMapper.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, convenientElevatingPointDTO.getWechatAccount()));
+
Long id = convenientElevatingPointDTO.getId();
ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(id);
if (isNull(convenientElevatingPointDO)) {
return R.fail("自提点不存在");
}
- Long communityId = convenientElevatingPointDTO.getCommunityId();
+ if (nonNull(convenientElevatingPointDODB) && !convenientElevatingPointDODB.getId().equals(convenientElevatingPointDO.getId())) {
+ R.fail("该微信手机号:" + convenientElevatingPointDTO.getWechatAccount() + "已被使用！请更换");
+ }
+ String communityId = convenientElevatingPointDTO.getCommunityId();
if (nonNull(communityId)) {
- ComActDO comActDO = comActDAO.selectById(communityId);
- if(comActDO!=null){
+ 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);
@@ -102,7 +117,7 @@
@Override
public R deletePoint(Long pointId, Long operator) {
ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
- if (convenientElevatingPointDO.getPrepareGoodsNum() > 0){
+ if (convenientElevatingPointDO.getPrepareGoodsNum() > 0) {
return R.fail("该提货点暂时无法删除！若想删除需保证待提货数量为0");
}
int result = this.baseMapper.deletePointById(pointId, operator);
@@ -115,6 +130,64 @@
@Override
public R detailPoint(Long pointId) {
ConvenientElevatingPointDO convenientElevatingPointDO = this.baseMapper.selectById(pointId);
- return R.ok(convenientElevatingPointDO);
+ ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
+ BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
+ return R.ok(convenientElevatingPointVO);
+ }
+
+ public R findPointByMerchantId(Long merchantId, String lat, String lng) {
+ ConvenientMerchantDO convenientMerchantDO = convenientMerchantDAO.selectById(merchantId);
+ //服务最远距离 km
+ Integer serviceRange = convenientMerchantDO.getServiceRange();
+
+ Map<Object, Object> around = MapDistance.getAround(convenientMerchantDO.getLat(), convenientMerchantDO.getLon(), serviceRange * 1000d);
+ String maxLat = around.get("maxLat").toString();
+ String minLat = around.get("minLat").toString();
+ String minLng = around.get("minLng").toString();
+ String maxLng = around.get("maxLng").toString();
+ List<ConvenientElevatingPointDO> convenientElevatingPointDOS = this.baseMapper.selectList(
+ new LambdaQueryWrapper<ConvenientElevatingPointDO>()
+ .ge(ConvenientElevatingPointDO::getLat, Double.parseDouble(minLng))
+ .le(ConvenientElevatingPointDO::getLat, Double.parseDouble(maxLng))
+ .ge(ConvenientElevatingPointDO::getLon, Double.parseDouble(minLat))
+ .le(ConvenientElevatingPointDO::getLon, Double.parseDouble(maxLat))
+ .eq(ConvenientElevatingPointDO::getBusinessStatus,1));
+ List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
+ convenientElevatingPointDOS.forEach(f -> {
+ ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
+ BeanUtils.copyProperties(f, convenientElevatingPointVO);
+ Double distance = MapDistance.distanceOfTwoPoints(lat, lng, f.getLon(), f.getLat());
+ convenientElevatingPointVO.setDistance(distance);
+ convenientElevatingPointVOS.add(convenientElevatingPointVO);
+ });
+ Collections.sort(convenientElevatingPointVOS);
+ return R.ok(convenientElevatingPointVOS);
+
+ }
+
+ @Override
+ public R findPointNumByDistance(Integer distance, String lat, String lng) {
+ Map<Object, Object> around = MapDistance.getAround(lat, lng, distance * 1000d);
+ String maxLat = around.get("maxLat").toString();
+ String minLat = around.get("minLat").toString();
+ String minLng = around.get("minLng").toString();
+ String maxLng = around.get("maxLng").toString();
+ List<ConvenientElevatingPointDO> convenientElevatingPointDOS = this.baseMapper.selectList(
+ new LambdaQueryWrapper<ConvenientElevatingPointDO>()
+ .ge(ConvenientElevatingPointDO::getLat, Double.parseDouble(minLng))
+ .le(ConvenientElevatingPointDO::getLat, Double.parseDouble(maxLng))
+ .ge(ConvenientElevatingPointDO::getLon, Double.parseDouble(minLat))
+ .le(ConvenientElevatingPointDO::getLon, Double.parseDouble(maxLat))
+ .eq(ConvenientElevatingPointDO::getBusinessStatus,1));
+ List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
+ convenientElevatingPointDOS.forEach(f -> {
+ ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
+ BeanUtils.copyProperties(f, convenientElevatingPointVO);
+ Double distancem = MapDistance.distanceOfTwoPoints(lat, lng, f.getLon(), f.getLat());
+ convenientElevatingPointVO.setDistance(distancem);
+ convenientElevatingPointVOS.add(convenientElevatingPointVO);
+ });
+ Collections.sort(convenientElevatingPointVOS);
+ return R.ok(convenientElevatingPointVOS.size());
}
}
--
Gitblit v1.7.1