20220822

xiaoyong931011

2022-08-29 eab74d698bb5c840146cc7bd54be2462f3ca4074

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -696,7 +696,7 @@
            authInfo.put("token", token);
            authInfo.put("member", mallMember);
            authInfo.put("rasToken", generateAsaToken(token));
            return new FebsResponse().success().message("登陆成功");
            return new FebsResponse().success().data(authInfo);
        }
        return new FebsResponse().fail().message("验证码错误");
    }
@@ -713,10 +713,10 @@

            DataDictionaryCustom rangeSize = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
            if(ObjectUtil.isEmpty(rangeSize)){
                return new FebsResponse().fail();
                return new FebsResponse().success().data(2);
            }
            if(StrUtil.isBlank(rangeSize.getValue())){
                return new FebsResponse().fail();
                return new FebsResponse().success().data(2);
            }
            //方位大小，换成单位：米
            Integer value = Integer.parseInt(rangeSize.getValue()) * 1000;
@@ -724,10 +724,10 @@
            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByLonAndLat(longitude, latitude);
            Double distance = mallTeamLeader.getDistance();
            if(value <= distance){
                return new FebsResponse().fail();
                return new FebsResponse().success().data(2);
            }
        }
        return new FebsResponse().success();
        return new FebsResponse().success().data(1);
    }

    private  String getXcxLoginUrl(String code) {