From 67bc217ccb7a845ad3633b699ed7c7aa518941df Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Sep 2022 17:16:43 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 72 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
index 806d8cb..8308a61 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
@@ -96,6 +96,9 @@
public FebsResponse leaderUpdate(MallTeamLeader mallTeamLeader) {
Long id = mallTeamLeader.getId();
MallTeamLeader mallTeamLeaders = this.baseMapper.selectById(id);
+ if(1 == mallTeamLeaders.getOnlineState()){
+ return new FebsResponse().fail().message("请先让团长离线");
+ }
if(ObjectUtil.isEmpty(mallTeamLeaders)){
return new FebsResponse().fail().message("团长信息不存在，刷新重试");
}
@@ -140,6 +143,9 @@
@Override
public FebsResponse leaderCancel(Long id) {
MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
+ if(1 == mallTeamLeader.getOnlineState()){
+ return new FebsResponse().fail().message("请先让团长离线");
+ }
if(ObjectUtil.isEmpty(mallTeamLeader)){
return new FebsResponse().fail().message("团长信息不存在");
}
@@ -249,7 +255,13 @@
private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
@Override
+ @Transactional
public FebsResponse addFence(AdminLeaderAddFenceDto adminLeaderAddFenceDto) {
+ Long id = adminLeaderAddFenceDto.getId();
+ MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
+ if(1 == mallTeamLeader.getOnlineState()){
+ return new FebsResponse().fail().message("请先让团长离线");
+ }
//如果电子围栏表为空，
//先查询服务是否已经创建，
//没有，再创建服务。
@@ -260,20 +272,22 @@
if("fail".equals(resultStr)){
return new FebsResponse().fail().message("高德地图查询服务失败");
}
- JSONObject jsonObject = JSONUtil.parseObj(resultStr);
- String results = jsonObject.get("results").toString();
- JSONArray jsonArray = JSONUtil.parseArray(results);
- for(Object jsonArray1 : jsonArray){
- JSONObject jsonObject1 = JSONUtil.parseObj(jsonArray1);
- String name = jsonObject1.get("name").toString();
- String sid = jsonObject1.get("sid").toString();
- if(xcxProperties.getServiceName().equals(name)){
- serviceId= sid;
- break;
- }
- }
- if(StrUtil.isBlank(serviceId)){
+ log.info(resultStr);
+ if("null".equals(resultStr) || StrUtil.isBlank(resultStr)){
serviceId = iMallElectronicFenceService.trackServiceAdd(xcxProperties.getGaodeKey(), xcxProperties.getServiceName());
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(resultStr);
+ String results = jsonObject.get("results").toString();
+ JSONArray jsonArray = JSONUtil.parseArray(results);
+ for(Object jsonArray1 : jsonArray){
+ JSONObject jsonObject1 = JSONUtil.parseObj(jsonArray1);
+ String name = jsonObject1.get("name").toString();
+ String sid = jsonObject1.get("sid").toString();
+ if(xcxProperties.getServiceName().equals(name)){
+ serviceId= sid;
+ break;
+ }
+ }
}
}else{
serviceId = mallElectronicFences.get(0).getServiceId();
@@ -281,8 +295,6 @@
if("fail".equals(serviceId)){
return new FebsResponse().fail().message("高德地图创建服务失败");
}
- Long id = adminLeaderAddFenceDto.getId();
- MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
String uniqueCode = mallTeamLeader.getUniqueCode();
MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(uniqueCode);
if(ObjectUtil.isEmpty(mallElectronicFence)){
@@ -318,4 +330,34 @@
return new FebsResponse().success();
}
+ @Override
+ public FebsResponse startOnline(Long id) {
+ MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallTeamLeader)){
+ return new FebsResponse().fail().message("团长信息不存在，刷新重试");
+ }
+ Integer state = mallTeamLeader.getState();
+ if(1!=state){
+ return new FebsResponse().fail().message("目前还不是团长，无法操作");
+ }
+ MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
+ if(ObjectUtil.isEmpty(mallElectronicFence)){
+ return new FebsResponse().fail().message("请先设置配送范围");
+ }
+ mallTeamLeader.setOnlineState(1);
+ this.baseMapper.updateById(mallTeamLeader);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse closeOnline(Long id) {
+ MallTeamLeader mallTeamLeader = this.baseMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallTeamLeader)){
+ return new FebsResponse().fail().message("团长信息不存在，刷新重试");
+ }
+ mallTeamLeader.setOnlineState(2);
+ this.baseMapper.updateById(mallTeamLeader);
+ return new FebsResponse().success();
+ }
+
}
--
Gitblit v1.9.1