From 35f85b4a4c330943497a59b46b2b46f5fbae1e12 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 17:25:58 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 9445b23..0015aeb 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -173,7 +173,10 @@
String longLatStr = mallElectronicFence.getLonglatiarr();
apiLeaderInfoVo.setLonglatiarr(longLatStr);
}
- mallLeaderDefaultMapper.deleteById(mallLeaderDefaultMapper.selectByMemberId(member.getId()).getId());
+ MallLeaderDefault mallLeaderDefault1 = mallLeaderDefaultMapper.selectByMemberId(member.getId());
+ if(ObjectUtil.isNotEmpty(mallLeaderDefault1)){
+ mallLeaderDefaultMapper.deleteById(mallLeaderDefaultMapper.selectByMemberId(member.getId()).getId());
+ }
MallLeaderDefault mallLeaderDefault = new MallLeaderDefault();
mallLeaderDefault.setMemberId(member.getId());
mallLeaderDefault.setUniqueCode(mallTeamLeader.getUniqueCode());
@@ -292,21 +295,23 @@
if(ObjectUtil.isNotEmpty(mallLeaderDefault)){
mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(mallLeaderDefault.getUniqueCode());
}
- }
- //特征码扫码
- if(StrUtil.isNotEmpty(uniqueCode)){
- mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(uniqueCode);
-
- //经纬度定位
- }else if(longitude != 0 && latitude != 0){
- mallTeamLeader = this.baseMapper.selectLeaderByLonAndLat(longitude,latitude);
- //直接进入，默认选择列表第一个
}else{
- List<MallTeamLeader> mallTeamLeaderList = this.baseMapper.getMallTeamLeaderList();
- if(CollUtil.isNotEmpty(mallTeamLeaderList)){
- mallTeamLeader = mallTeamLeaderList.get(0);
+ //特征码扫码
+ if(StrUtil.isNotEmpty(uniqueCode)){
+ mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(uniqueCode);
+
+ //经纬度定位
+ }else if(longitude != 0 && latitude != 0){
+ mallTeamLeader = this.baseMapper.selectLeaderByLonAndLat(longitude,latitude);
+ //直接进入，默认选择列表第一个
+ }else{
+ List<MallTeamLeader> mallTeamLeaderList = this.baseMapper.getMallTeamLeaderList();
+ if(CollUtil.isNotEmpty(mallTeamLeaderList)){
+ mallTeamLeader = mallTeamLeaderList.get(0);
+ }
}
}
+
if(ObjectUtil.isNotEmpty(mallTeamLeader)){
apiLeaderInfoVo.setId(mallTeamLeader.getId());
apiLeaderInfoVo.setName(mallTeamLeader.getName());
--
Gitblit v1.9.1