20220902

xiaoyong931011

2022-09-23 19ab08f041d6773f22594ed393105c623e09f543

 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());