From 89ff1d1668c471c293dedd312a4eb98a6ebfd06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 18 Aug 2022 16:51:47 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index ce21773..2203ca0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/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) {
--
Gitblit v1.9.1