记得上下班打卡 | 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
0f24d155
Commit
0f24d155
authored
Sep 03, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员下单预览+地区+身份标识;
parent
c80aca7a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
AdamMemberOrderPreviewVo.java
...quidnet/service/adam/dto/vo/AdamMemberOrderPreviewVo.java
+2
-0
AdamMemberOrderController.java
...et/service/adam/controller/AdamMemberOrderController.java
+3
-3
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderPreviewVo.java
View file @
0f24d155
...
@@ -22,6 +22,8 @@ public class AdamMemberOrderPreviewVo implements Serializable {
...
@@ -22,6 +22,8 @@ public class AdamMemberOrderPreviewVo implements Serializable {
private
String
birthday
;
private
String
birthday
;
@ApiModelProperty
(
position
=
15
,
value
=
"常住地/区域[100]"
,
example
=
"北京 北京市 朝阳区"
)
@ApiModelProperty
(
position
=
15
,
value
=
"常住地/区域[100]"
,
example
=
"北京 北京市 朝阳区"
)
private
String
area
;
private
String
area
;
@ApiModelProperty
(
position
=
20
,
value
=
"标记[0-普通用户|2-过期会员|10-老会员|11-新会员]"
)
private
Integer
stageMarker
;
private
static
final
AdamMemberOrderPreviewVo
obj
=
new
AdamMemberOrderPreviewVo
();
private
static
final
AdamMemberOrderPreviewVo
obj
=
new
AdamMemberOrderPreviewVo
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @
0f24d155
...
@@ -75,11 +75,11 @@ public class AdamMemberOrderController {
...
@@ -75,11 +75,11 @@ public class AdamMemberOrderController {
AdamUserMemberVo
userMemberVo
=
adamRdmService
.
getUserMemberVoByUid
(
currentUid
);
AdamUserMemberVo
userMemberVo
=
adamRdmService
.
getUserMemberVoByUid
(
currentUid
);
if
(
null
==
userMemberVo
)
{
if
(
null
==
userMemberVo
)
{
member
Vo
.
setStageMarker
(
0
);
preview
Vo
.
setStageMarker
(
0
);
}
else
if
(
userMemberVo
.
isActive
())
{
}
else
if
(
userMemberVo
.
isActive
())
{
member
Vo
.
setStageMarker
(
userMemberVo
.
isOldMember
()
?
10
:
11
);
preview
Vo
.
setStageMarker
(
userMemberVo
.
isOldMember
()
?
10
:
11
);
}
else
{
}
else
{
member
Vo
.
setStageMarker
(
2
);
preview
Vo
.
setStageMarker
(
2
);
}
}
AdamUserInfoVo
userInfoVo
=
adamRdmService
.
getUserInfoVoByUid
(
currentUid
);
AdamUserInfoVo
userInfoVo
=
adamRdmService
.
getUserInfoVoByUid
(
currentUid
);
...
...
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