记得上下班打卡 | 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
ae75c33c
Commit
ae75c33c
authored
Dec 13, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~会员信息中会员ID返显页面补位处理;
parent
c5c7199e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
AdamUserMemberVo.java
...a/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
+6
-0
AdamMemberController.java
...quidnet/service/adam/controller/AdamMemberController.java
+2
-2
AdamUserController.java
...liquidnet/service/adam/controller/AdamUserController.java
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
View file @
ae75c33c
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.adam.entity.AdamUserMember;
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.adam.entity.AdamUserMember;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -36,6 +37,11 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
...
@@ -36,6 +37,11 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
public
String
getMemberNo
()
{
// return memberNo;
return
StringUtils
.
leftPad
(
memberNo
,
7
,
"0"
);
}
public
static
final
LocalDateTime
spotTime
=
LocalDateTime
.
parse
(
"2021-10-14 21:30:00"
,
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
public
static
final
LocalDateTime
spotTime
=
LocalDateTime
.
parse
(
"2021-10-14 21:30:00"
,
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
private
static
final
AdamUserMemberVo
obj
=
new
AdamUserMemberVo
();
private
static
final
AdamUserMemberVo
obj
=
new
AdamUserMemberVo
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java
View file @
ae75c33c
...
@@ -119,7 +119,7 @@ public class AdamMemberController {
...
@@ -119,7 +119,7 @@ public class AdamMemberController {
joinusVo
.
setState
(
1
);
joinusVo
.
setState
(
1
);
joinusVo
.
setQrCode
(
userInfoVo
.
getQrCode
());
joinusVo
.
setQrCode
(
userInfoVo
.
getQrCode
());
if
(
null
!=
userMemberVo
)
{
if
(
null
!=
userMemberVo
)
{
joinusVo
.
setMemberNo
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
leftPad
(
userMemberVo
.
getMemberNo
(),
7
,
"0"
));
joinusVo
.
setMemberNo
(
userMemberVo
.
getMemberNo
(
));
}
}
}
}
...
@@ -149,7 +149,7 @@ public class AdamMemberController {
...
@@ -149,7 +149,7 @@ public class AdamMemberController {
joinusVo
.
setState
(
1
);
joinusVo
.
setState
(
1
);
joinusVo
.
setQrCode
(
userInfoVo
.
getQrCode
());
joinusVo
.
setQrCode
(
userInfoVo
.
getQrCode
());
if
(
null
!=
userMemberVo
)
{
if
(
null
!=
userMemberVo
)
{
joinusVo
.
setMemberNo
(
org
.
apache
.
commons
.
lang3
.
StringUtils
.
leftPad
(
userMemberVo
.
getMemberNo
(),
7
,
"0"
));
joinusVo
.
setMemberNo
(
userMemberVo
.
getMemberNo
(
));
}
}
try
{
try
{
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @
ae75c33c
...
@@ -412,7 +412,7 @@ public class AdamUserController {
...
@@ -412,7 +412,7 @@ public class AdamUserController {
memberJoinusVo
.
setState
(
1
);
memberJoinusVo
.
setState
(
1
);
memberJoinusVo
.
setQrCode
(
userInfoVo
.
getQrCode
());
memberJoinusVo
.
setQrCode
(
userInfoVo
.
getQrCode
());
if
(
null
!=
userMemberVo
)
{
if
(
null
!=
userMemberVo
)
{
memberJoinusVo
.
setMemberNo
(
StringUtils
.
leftPad
(
userMemberVo
.
getMemberNo
(),
7
,
"0"
));
memberJoinusVo
.
setMemberNo
(
userMemberVo
.
getMemberNo
(
));
}
}
}
}
userProfileVo
.
setMemberJoinusVo
(
memberJoinusVo
);
userProfileVo
.
setMemberJoinusVo
(
memberJoinusVo
);
...
...
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