记得上下班打卡 | git大法好,push需谨慎

Commit 00ce722a authored by 张国柄's avatar 张国柄

opt.loginVo;

parent 949efe91
......@@ -14,12 +14,12 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
private String token;
@ApiModelProperty(position = 12, value = "用户信息")
private AdamUserInfoVo userInfo;
@ApiModelProperty(position = 13, value = "实名信息")
private AdamRealInfoVo realNameInfo;
@ApiModelProperty(position = 14, value = "用户第三方账号信息")
private List<AdamThirdPartInfoVo> thirdPartInfo;
@ApiModelProperty(position = 15, value = "会员信息")
private AdamMemberSimpleVo memberVo;
// @ApiModelProperty(position = 13, value = "实名信息")
// private AdamRealInfoVo realNameInfo;
// @ApiModelProperty(position = 14, value = "用户第三方账号信息")
// private List<AdamThirdPartInfoVo> thirdPartInfo;
// @ApiModelProperty(position = 15, value = "会员信息")
// private AdamMemberSimpleVo memberVo;
@ApiModelProperty(position = 16, value = "用户会员信息")
private AdamUserMemberVo userMemberVo;
......@@ -44,29 +44,29 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
this.userInfo = userInfo;
}
public AdamRealInfoVo getRealNameInfo() {
return realNameInfo;
}
public void setRealNameInfo(AdamRealInfoVo realNameInfo) {
this.realNameInfo = realNameInfo;
}
public List<AdamThirdPartInfoVo> getThirdPartInfo() {
return thirdPartInfo;
}
public void setThirdPartInfo(List<AdamThirdPartInfoVo> thirdPartInfo) {
this.thirdPartInfo = thirdPartInfo;
}
public AdamMemberSimpleVo getMemberVo() {
return memberVo;
}
public void setMemberVo(AdamMemberSimpleVo memberVo) {
this.memberVo = memberVo;
}
// public AdamRealInfoVo getRealNameInfo() {
// return realNameInfo;
// }
//
// public void setRealNameInfo(AdamRealInfoVo realNameInfo) {
// this.realNameInfo = realNameInfo;
// }
//
// public List<AdamThirdPartInfoVo> getThirdPartInfo() {
// return thirdPartInfo;
// }
//
// public void setThirdPartInfo(List<AdamThirdPartInfoVo> thirdPartInfo) {
// this.thirdPartInfo = thirdPartInfo;
// }
//
// public AdamMemberSimpleVo getMemberVo() {
// return memberVo;
// }
//
// public void setMemberVo(AdamMemberSimpleVo memberVo) {
// this.memberVo = memberVo;
// }
public AdamUserMemberVo getUserMemberVo() {
return userMemberVo;
......
......@@ -62,7 +62,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*
* @return true-有效
*/
@JsonIgnore
// @JsonIgnore
public boolean isActive() {
LocalDateTime expiryAt = this.getExpiryAt();
return this.getState() == 1 && null != expiryAt && expiryAt.isAfter(LocalDateTime.now());
......@@ -73,7 +73,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*
* @return true-是
*/
@JsonIgnore
// @JsonIgnore
public boolean isOldMember() {
LocalDateTime createdAt = this.getCreatedAt();
return createdAt.isAfter(newMemberStartTime);
......
......@@ -279,7 +279,7 @@ public class AdamLoginController {
} else {
AdamUserInfoVo registerUserInfo = registerRespDto.getData();
loginInfoVo.setUserInfo(registerUserInfo);
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
// loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
}
toRegister = true;
}
......
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