From f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期五, 06 九月 2024 11:58:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2 --- src/main/java/com/mzl/flower/web/member/MemberController.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/member/MemberController.java b/src/main/java/com/mzl/flower/web/member/MemberController.java index b239db0..89997cc 100644 --- a/src/main/java/com/mzl/flower/web/member/MemberController.java +++ b/src/main/java/com/mzl/flower/web/member/MemberController.java @@ -38,8 +38,8 @@ private final MemberGrowthRecordService memberGrowthRecordService; - @PostMapping("/member/list") - @ApiOperation(value = "会员列表", httpMethod = "POST") + @GetMapping("/member/list") + @ApiOperation(value = "会员列表", httpMethod = "GET") public ResponseEntity<ReturnDataDTO<Page<MemberVO>>> getMemberList(Page page, MemberQueryDTO dto) { return returnData(R.SUCCESS.getCode(), memberService.queryPage(dto, page)); } @@ -54,16 +54,13 @@ @PostMapping(value = "/member/new") @ApiOperation(value = "保存会员", httpMethod = "POST") public ResponseEntity insert(@RequestBody MemberDTO memberDTO) { - Member member = new Member(); - BeanUtils.copyProperties(memberDTO, member); - member.create(SecurityUtils.getUserId()); - memberService.saveMember(member); + memberService.saveMember(memberDTO); return returnData(R.SUCCESS.getCode(), null); } @PostMapping(value = "/member/edit") @ApiOperation(value = "更新会员", httpMethod = "POST") - public ResponseEntity update(@Validated @RequestBody MemberDTO memberDTO) { + public ResponseEntity update(@RequestBody MemberDTO memberDTO) { memberService.updateMember(memberDTO); return returnData(R.SUCCESS.getCode(), null); } @@ -102,5 +99,12 @@ UserGrowthRecordDTO userGrowthRecordDTO = memberGrowthRecordService.getInfoByUserId(String.valueOf(userId)); return returnData(R.SUCCESS.getCode(), userGrowthRecordDTO); } + + @GetMapping(value = "/app/member/info") + @ApiOperation(value = "当前用户会员信息 ", httpMethod = "GET", notes = "ID") + public ResponseEntity memberInfo2() { + UserGrowthRecordDTO userGrowthRecordDTO = memberGrowthRecordService.getInfoByUserId(SecurityUtils.getUserId()); + return returnData(R.SUCCESS.getCode(), userGrowthRecordDTO); + } } -- Gitblit v1.9.3