记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
00ce722a
Commit
00ce722a
authored
Aug 30, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opt.loginVo;
parent
949efe91
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
32 deletions
+32
-32
AdamLoginInfoVo.java
...va/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java
+29
-29
AdamUserMemberVo.java
...a/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
+2
-2
AdamLoginController.java
...iquidnet/service/adam/controller/AdamLoginController.java
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java
View file @
00ce722a
...
@@ -14,12 +14,12 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
...
@@ -14,12 +14,12 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
private
String
token
;
private
String
token
;
@ApiModelProperty
(
position
=
12
,
value
=
"用户信息"
)
@ApiModelProperty
(
position
=
12
,
value
=
"用户信息"
)
private
AdamUserInfoVo
userInfo
;
private
AdamUserInfoVo
userInfo
;
@ApiModelProperty
(
position
=
13
,
value
=
"实名信息"
)
//
@ApiModelProperty(position = 13, value = "实名信息")
private
AdamRealInfoVo
realNameInfo
;
//
private AdamRealInfoVo realNameInfo;
@ApiModelProperty
(
position
=
14
,
value
=
"用户第三方账号信息"
)
//
@ApiModelProperty(position = 14, value = "用户第三方账号信息")
private
List
<
AdamThirdPartInfoVo
>
thirdPartInfo
;
//
private List<AdamThirdPartInfoVo> thirdPartInfo;
@ApiModelProperty
(
position
=
15
,
value
=
"会员信息"
)
//
@ApiModelProperty(position = 15, value = "会员信息")
private
AdamMemberSimpleVo
memberVo
;
//
private AdamMemberSimpleVo memberVo;
@ApiModelProperty
(
position
=
16
,
value
=
"用户会员信息"
)
@ApiModelProperty
(
position
=
16
,
value
=
"用户会员信息"
)
private
AdamUserMemberVo
userMemberVo
;
private
AdamUserMemberVo
userMemberVo
;
...
@@ -44,29 +44,29 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
...
@@ -44,29 +44,29 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
this
.
userInfo
=
userInfo
;
this
.
userInfo
=
userInfo
;
}
}
public
AdamRealInfoVo
getRealNameInfo
()
{
//
public AdamRealInfoVo getRealNameInfo() {
return
realNameInfo
;
//
return realNameInfo;
}
//
}
//
public
void
setRealNameInfo
(
AdamRealInfoVo
realNameInfo
)
{
//
public void setRealNameInfo(AdamRealInfoVo realNameInfo) {
this
.
realNameInfo
=
realNameInfo
;
//
this.realNameInfo = realNameInfo;
}
//
}
//
public
List
<
AdamThirdPartInfoVo
>
getThirdPartInfo
()
{
//
public List<AdamThirdPartInfoVo> getThirdPartInfo() {
return
thirdPartInfo
;
//
return thirdPartInfo;
}
//
}
//
public
void
setThirdPartInfo
(
List
<
AdamThirdPartInfoVo
>
thirdPartInfo
)
{
//
public void setThirdPartInfo(List<AdamThirdPartInfoVo> thirdPartInfo) {
this
.
thirdPartInfo
=
thirdPartInfo
;
//
this.thirdPartInfo = thirdPartInfo;
}
//
}
//
public
AdamMemberSimpleVo
getMemberVo
()
{
//
public AdamMemberSimpleVo getMemberVo() {
return
memberVo
;
//
return memberVo;
}
//
}
//
public
void
setMemberVo
(
AdamMemberSimpleVo
memberVo
)
{
//
public void setMemberVo(AdamMemberSimpleVo memberVo) {
this
.
memberVo
=
memberVo
;
//
this.memberVo = memberVo;
}
//
}
public
AdamUserMemberVo
getUserMemberVo
()
{
public
AdamUserMemberVo
getUserMemberVo
()
{
return
userMemberVo
;
return
userMemberVo
;
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
View file @
00ce722a
...
@@ -62,7 +62,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
...
@@ -62,7 +62,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*
*
* @return true-有效
* @return true-有效
*/
*/
@JsonIgnore
//
@JsonIgnore
public
boolean
isActive
()
{
public
boolean
isActive
()
{
LocalDateTime
expiryAt
=
this
.
getExpiryAt
();
LocalDateTime
expiryAt
=
this
.
getExpiryAt
();
return
this
.
getState
()
==
1
&&
null
!=
expiryAt
&&
expiryAt
.
isAfter
(
LocalDateTime
.
now
());
return
this
.
getState
()
==
1
&&
null
!=
expiryAt
&&
expiryAt
.
isAfter
(
LocalDateTime
.
now
());
...
@@ -73,7 +73,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
...
@@ -73,7 +73,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*
*
* @return true-是
* @return true-是
*/
*/
@JsonIgnore
//
@JsonIgnore
public
boolean
isOldMember
()
{
public
boolean
isOldMember
()
{
LocalDateTime
createdAt
=
this
.
getCreatedAt
();
LocalDateTime
createdAt
=
this
.
getCreatedAt
();
return
createdAt
.
isAfter
(
newMemberStartTime
);
return
createdAt
.
isAfter
(
newMemberStartTime
);
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @
00ce722a
...
@@ -279,7 +279,7 @@ public class AdamLoginController {
...
@@ -279,7 +279,7 @@ public class AdamLoginController {
}
else
{
}
else
{
AdamUserInfoVo
registerUserInfo
=
registerRespDto
.
getData
();
AdamUserInfoVo
registerUserInfo
=
registerRespDto
.
getData
();
loginInfoVo
.
setUserInfo
(
registerUserInfo
);
loginInfoVo
.
setUserInfo
(
registerUserInfo
);
loginInfoVo
.
setThirdPartInfo
(
adamRdmService
.
getThirdPartVoListByUid
(
registerUserInfo
.
getUid
()));
//
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
}
}
toRegister
=
true
;
toRegister
=
true
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment