diff --git a/src/main/java/com/ifish/dto/UserInfoDto.java b/src/main/java/com/ifish/dto/UserInfoDto.java index 4a92d39..2d7f13b 100644 --- a/src/main/java/com/ifish/dto/UserInfoDto.java +++ b/src/main/java/com/ifish/dto/UserInfoDto.java @@ -48,6 +48,10 @@ public class UserInfoDto { * 技威CODE2 */ private String P2PVerifyCode2; + + private String sessionID; + + private String sessionID2; /** * 技威用户ID */ @@ -129,5 +133,20 @@ public class UserInfoDto { public void setNeteaseToken(String neteaseToken) { this.neteaseToken = neteaseToken; } - + + public String getSessionID() { + return sessionID; + } + + public void setSessionID(String sessionID) { + this.sessionID = sessionID; + } + + public String getSessionID2() { + return sessionID2; + } + + public void setSessionID2(String sessionID2) { + this.sessionID2 = sessionID2; + } } diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java index 747f17c..1ff572c 100644 --- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java @@ -314,7 +314,7 @@ public class UserServiceImpl implements UserService { //更新登陆参数 userDao.executeLoginUpdate(userId,loginParam.getLoginType()); //用户基本信息 - UserInfoDto userInfoDto = getUserInfoDto(user); + UserInfoDto userInfoDto = getUserInfoDto(user,gwellParam); //用户资产信息 UserAssetDto userAssetDto = getUserAssetInfo(userId); //返回json信息 @@ -987,7 +987,7 @@ public class UserServiceImpl implements UserService { * @param user * @return */ - public UserInfoDto getUserInfoDto(User user){ + public UserInfoDto getUserInfoDto(User user,GwellParamDto gwellParam){ UserInfoDto dto = new UserInfoDto(); dto.setUserId(user.getUserId()); dto.setPhoneNumber(user.getPhoneNumber()); @@ -997,6 +997,10 @@ public class UserServiceImpl implements UserService { dto.setUserImg(user.getUserImg()); dto.setP2PVerifyCode1(user.getP2PVerifyCode1()); dto.setP2PVerifyCode2(user.getP2PVerifyCode2()); + if (gwellParam != null) { + dto.setSessionID(gwellParam.getSessionID()); + dto.setSessionID2(gwellParam.getSessionID2()); + } dto.setGwellUserID(user.getGwellUserID()); dto.setNeteaseToken(user.getNeteaseToken()); dto.setUserType(user.getUserType());