记得上下班打卡 | 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
3a424d6b
Commit
3a424d6b
authored
Jun 24, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
f3922092
867c44ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
AdamAddressesController.java
...dnet/service/adam/controller/AdamAddressesController.java
+4
-0
AdamMemberController.java
...quidnet/service/adam/controller/AdamMemberController.java
+6
-2
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java
View file @
3a424d6b
...
...
@@ -131,6 +131,10 @@ public class AdamAddressesController {
return
ResponseDto
.
success
(
vo
);
}
/* ------------------------------------------------------------|API */
@ApiOperationSupport
(
order
=
99
)
@ApiOperation
(
value
=
"@API:收货地址"
,
notes
=
"查取用户指定收货地址详情"
)
@GetMapping
(
"query/depth"
)
public
ResponseDto
<
AdamAddressesVo
>
queryForDepth
(
@NotBlank
@RequestParam
String
addrId
,
@NotBlank
@RequestParam
String
uid
)
{
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java
View file @
3a424d6b
...
...
@@ -37,7 +37,7 @@ public class AdamMemberController {
@Autowired
IAdamUserMemberService
adamUserMemberService
;
@ApiOperationSupport
(
order
=
0
)
@ApiOperationSupport
(
order
=
1
)
@ApiOperation
(
value
=
"会员信息"
)
@GetMapping
(
"info"
)
public
ResponseDto
<
AdamMemberVo
>
query
()
{
...
...
@@ -56,13 +56,17 @@ public class AdamMemberController {
return
ResponseDto
.
success
(
memberVo
);
}
@ApiOperationSupport
(
order
=
1
)
@ApiOperationSupport
(
order
=
2
)
@ApiOperation
(
value
=
"会员协议"
)
@GetMapping
(
"agreement"
)
public
ResponseDto
<
String
>
agreement
()
{
return
ResponseDto
.
success
(
adamRdmService
.
getMemberAgreement
());
}
/* ------------------------------------------------------------|API */
@ApiOperationSupport
(
order
=
99
)
@ApiOperation
(
value
=
"@API:是否会员"
,
notes
=
"根据UID判断用户是否会员,响应参数[`data`:true-是,false-否]"
)
@GetMapping
(
"check/depth"
)
public
ResponseDto
<
Boolean
>
isMember
(
@NotBlank
@RequestParam
String
uid
)
{
AdamUserMemberVo
userMemberInfo
=
adamRdmService
.
getUserMemberVoByUid
(
uid
);
...
...
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