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

Commit 3a424d6b authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/dev' into dev

parents f3922092 867c44ee
...@@ -131,6 +131,10 @@ public class AdamAddressesController { ...@@ -131,6 +131,10 @@ public class AdamAddressesController {
return ResponseDto.success(vo); return ResponseDto.success(vo);
} }
/* ------------------------------------------------------------|API */
@ApiOperationSupport(order = 99)
@ApiOperation(value = "@API:收货地址", notes = "查取用户指定收货地址详情")
@GetMapping("query/depth") @GetMapping("query/depth")
public ResponseDto<AdamAddressesVo> queryForDepth(@NotBlank @RequestParam String addrId, public ResponseDto<AdamAddressesVo> queryForDepth(@NotBlank @RequestParam String addrId,
@NotBlank @RequestParam String uid) { @NotBlank @RequestParam String uid) {
......
...@@ -37,7 +37,7 @@ public class AdamMemberController { ...@@ -37,7 +37,7 @@ public class AdamMemberController {
@Autowired @Autowired
IAdamUserMemberService adamUserMemberService; IAdamUserMemberService adamUserMemberService;
@ApiOperationSupport(order = 0) @ApiOperationSupport(order = 1)
@ApiOperation(value = "会员信息") @ApiOperation(value = "会员信息")
@GetMapping("info") @GetMapping("info")
public ResponseDto<AdamMemberVo> query() { public ResponseDto<AdamMemberVo> query() {
...@@ -56,13 +56,17 @@ public class AdamMemberController { ...@@ -56,13 +56,17 @@ public class AdamMemberController {
return ResponseDto.success(memberVo); return ResponseDto.success(memberVo);
} }
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 2)
@ApiOperation(value = "会员协议") @ApiOperation(value = "会员协议")
@GetMapping("agreement") @GetMapping("agreement")
public ResponseDto<String> agreement() { public ResponseDto<String> agreement() {
return ResponseDto.success(adamRdmService.getMemberAgreement()); return ResponseDto.success(adamRdmService.getMemberAgreement());
} }
/* ------------------------------------------------------------|API */
@ApiOperationSupport(order = 99)
@ApiOperation(value = "@API:是否会员", notes = "根据UID判断用户是否会员,响应参数[`data`:true-是,false-否]")
@GetMapping("check/depth") @GetMapping("check/depth")
public ResponseDto<Boolean> isMember(@NotBlank @RequestParam String uid) { public ResponseDto<Boolean> isMember(@NotBlank @RequestParam String uid) {
AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid); AdamUserMemberVo userMemberInfo = adamRdmService.getUserMemberVoByUid(uid);
......
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