Commit 8c3e8204 authored by 王向伟's avatar 王向伟

解决用户状态为空的问题

parent d51deb04
...@@ -27,6 +27,7 @@ import cn.quantgroup.customer.util.IdcardUtils; ...@@ -27,6 +27,7 @@ import cn.quantgroup.customer.util.IdcardUtils;
import cn.quantgroup.customer.util.JSONTools; import cn.quantgroup.customer.util.JSONTools;
import cn.quantgroup.customer.util.ValidationUtil; import cn.quantgroup.customer.util.ValidationUtil;
import cn.quantgroup.riskcontrol.model.AuthenticationUserDetail; import cn.quantgroup.riskcontrol.model.AuthenticationUserDetail;
import cn.quantgroup.user.retbean.XUser;
import cn.quantgroup.user.retbean.XUserDetail; import cn.quantgroup.user.retbean.XUserDetail;
import cn.quantgroup.user.retbean.XUserFullInfo; import cn.quantgroup.user.retbean.XUserFullInfo;
import cn.quantgroup.user.vo.UserSysResult; import cn.quantgroup.user.vo.UserSysResult;
...@@ -227,7 +228,7 @@ public class UserServiceImpl implements IUserService { ...@@ -227,7 +228,7 @@ public class UserServiceImpl implements IUserService {
return JsonResult.buildErrorStateResult("不存在相关用户信息", null); return JsonResult.buildErrorStateResult("不存在相关用户信息", null);
} }
XUserDetail userDetail = xUserDetails.get(0); XUserDetail userDetail = xUserDetails.get(0);
UserBasicInfo userBasicInfo = new UserBasicInfo(); UserBasicInfo userBasicInfo = new UserBasicInfo();
String createAt = DateUtil.format(userDetail.getCreatedAt(), DateUtil.DATE_FORMAT_1); String createAt = DateUtil.format(userDetail.getCreatedAt(), DateUtil.DATE_FORMAT_1);
userBasicInfo.setCreateAt(createAt); userBasicInfo.setCreateAt(createAt);
...@@ -236,7 +237,11 @@ public class UserServiceImpl implements IUserService { ...@@ -236,7 +237,11 @@ public class UserServiceImpl implements IUserService {
userBasicInfo.setName(userDetail.getName()); userBasicInfo.setName(userDetail.getName());
userBasicInfo.setPhoneNo(userDetail.getPhoneNo()); userBasicInfo.setPhoneNo(userDetail.getPhoneNo());
userBasicInfo.setUserId(userDetail.getUserId()); userBasicInfo.setUserId(userDetail.getUserId());
userBasicInfo.setStatus(userDetail.getEnable() == null ? "未知":(userDetail.getEnable()? "正常" : "封禁")); UserSysResult<XUser> userByUserId = userSdk.getService().findUserByUserId(userDetail.getUserId());
if (userByUserId != null && userByUserId.isSuccess()) {
Boolean enable = userByUserId.getData().getEnable();
userBasicInfo.setStatus(enable == null ? "未知" : (enable ? "正常" : "封禁"));
}
return JsonResult.buildSuccessResult(null, userBasicInfo); return JsonResult.buildSuccessResult(null, userBasicInfo);
} catch (Exception e) { } catch (Exception e) {
...@@ -257,8 +262,13 @@ public class UserServiceImpl implements IUserService { ...@@ -257,8 +262,13 @@ public class UserServiceImpl implements IUserService {
userBasicInfo.setIdNo(userDetail.getIdNo()); userBasicInfo.setIdNo(userDetail.getIdNo());
userBasicInfo.setName(userDetail.getName()); userBasicInfo.setName(userDetail.getName());
userBasicInfo.setPhoneNo(userDetail.getPhoneNo()); userBasicInfo.setPhoneNo(userDetail.getPhoneNo());
userBasicInfo.setUserId(userDetail.getUserId()); userBasicInfo.setUserId(userDetail.getUserId());
userBasicInfo.setStatus(userDetail.getEnable() == null ? "未知":(userDetail.getEnable()? "正常" : "封禁")); UserSysResult<XUser> userByUserId = userSdk.getService().findUserByUserId(userDetail.getUserId());
if (userByUserId != null && userByUserId.isSuccess()) {
Boolean enable = userByUserId.getData().getEnable();
userBasicInfo.setStatus(enable == null ? "未知" : (enable ? "正常" : "封禁"));
}
} else { } else {
return (JsonResult) data; return (JsonResult) data;
} }
...@@ -344,7 +354,7 @@ public class UserServiceImpl implements IUserService { ...@@ -344,7 +354,7 @@ public class UserServiceImpl implements IUserService {
//参数个数验证 //参数个数验证
if (orderParam + userParam == 0) { if (orderParam + userParam == 0) {
result.setValue("参数全部为空"); result.setValue("参数不能为空");
return result; return result;
} }
...@@ -360,7 +370,7 @@ public class UserServiceImpl implements IUserService { ...@@ -360,7 +370,7 @@ public class UserServiceImpl implements IUserService {
return result; return result;
} }
result.setKey(false); result.setKey(false);
result.setValue("参数过多"); result.setValue("只能选择一个参数进行查询");
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment