From 673d4076b4ab27d206f66fa4aafa27b3ea5ba32f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 02 十二月 2022 11:19:58 +0800
Subject: [PATCH] #feat 设置时间
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientElevatingPointServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 f1662bc..a2d66ac 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
@@ -22,9 +22,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
@@ -67,6 +65,10 @@
@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);
String communityId = convenientElevatingPointDTO.getCommunityId();
@@ -89,10 +91,15 @@
@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("自提点不存在");
+ }
+ if (nonNull(convenientElevatingPointDODB) && !convenientElevatingPointDODB.getId().equals(convenientElevatingPointDO.getId())) {
+ R.fail("该微信手机号:" + convenientElevatingPointDTO.getWechatAccount() + "已被使用！请更换");
}
String communityId = convenientElevatingPointDTO.getCommunityId();
if (nonNull(communityId)) {
@@ -123,7 +130,9 @@
@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) {
@@ -141,7 +150,8 @@
.ge(ConvenientElevatingPointDO::getLat, minLng)
.le(ConvenientElevatingPointDO::getLat, maxLng)
.ge(ConvenientElevatingPointDO::getLon, minLat)
- .le(ConvenientElevatingPointDO::getLon, maxLat));
+ .le(ConvenientElevatingPointDO::getLon, maxLat)
+ .eq(ConvenientElevatingPointDO::getBusinessStatus,1));
List<ConvenientElevatingPointVO> convenientElevatingPointVOS = new ArrayList<>();
convenientElevatingPointDOS.forEach(f -> {
ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
@@ -150,6 +160,7 @@
convenientElevatingPointVO.setDistance(distance);
convenientElevatingPointVOS.add(convenientElevatingPointVO);
});
+ Collections.sort(convenientElevatingPointVOS);
return R.ok(convenientElevatingPointVOS);
}
--
Gitblit v1.7.1