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

Commit 834e31f8 authored by 张国柄's avatar 张国柄

fix:统一用户会员信息VO变量

parent cc7fe49e
......@@ -20,7 +20,7 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
@ApiModelProperty(position = 14, value = "用户第三方账号信息")
private List<AdamThirdPartInfoVo> thirdPartInfo;
@ApiModelProperty(position = 15, value = "会员信息")
private AdamMemberSimpleVo memberSimpleVo;
private AdamMemberSimpleVo memberVo;
@ApiModelProperty(position = 16, value = "用户会员信息")
private AdamUserMemberVo userMemberVo;
......
......@@ -56,7 +56,7 @@ public class AdamMemberVo implements java.io.Serializable, Cloneable {
@ApiModelProperty(position = 21, value = "会员专属权益")
private List<AdamMemberRightsVo> rightsVoList;
@ApiModelProperty(position = 22, value = "用户会员信息")
private AdamUserMemberVo memberInfo;
private AdamUserMemberVo userMemberVo;
private static final AdamMemberVo obj = new AdamMemberVo();
......
......@@ -138,7 +138,7 @@ public class AdamLoginController {
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
}
loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
return ResponseDto.success(loginInfoVo);
......@@ -167,7 +167,7 @@ public class AdamLoginController {
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
}
loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo));
return ResponseDto.success(AdamLoginInfoVo.getNew());
......@@ -192,7 +192,7 @@ public class AdamLoginController {
loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(uid));
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(uid));
loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
} else {// 新账号注册
if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode()))
return ResponseDto.failure(ErrorMapping.get("10002"));
......@@ -200,7 +200,7 @@ public class AdamLoginController {
AdamUserInfoVo registerUserInfo = adamUserService.register(parameter);
loginInfoVo.setUserInfo(registerUserInfo);
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
loginInfoVo.setMemberSimpleVo(adamRdmService.getMemberSimpleVo());
loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
}
loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
return ResponseDto.success(loginInfoVo);
......
......@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.controller;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
......@@ -16,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank;
import java.util.Date;
@ApiSupport(order = 10030)
@Api(tags = "会员信息")
......@@ -52,7 +49,9 @@ public class AdamMemberController {
memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId()));
memberVo.setMemberInfo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid()));
if (CurrentUtil.isLogged()) {
memberVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid()));
}
}
return ResponseDto.success(memberVo);
}
......
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