From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/member/MemberController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 b809569..be871ab 100644
--- a/src/main/java/com/mzl/flower/web/member/MemberController.java
+++ b/src/main/java/com/mzl/flower/web/member/MemberController.java
@@ -44,14 +44,14 @@
return returnData(R.SUCCESS.getCode(), memberService.queryPage(dto, page));
}
- @GetMapping(value = "/member/list/delete")
+ @GetMapping(value = "/member/delete")
@ApiOperation(value = "删除会员 ", httpMethod = "GET", notes = "ID")
public ResponseEntity delete(@NotNull(message = "id不能为空") Long id) {
memberService.deleteMember(String.valueOf(id));
return returnData(R.SUCCESS.getCode(), null);
}
- @PostMapping(value = "/member/list/new")
+ @PostMapping(value = "/member/new")
@ApiOperation(value = "保存会员", httpMethod = "POST")
public ResponseEntity insert(@RequestBody MemberDTO memberDTO) {
Member member = new Member();
@@ -61,7 +61,7 @@
return returnData(R.SUCCESS.getCode(), null);
}
- @PostMapping(value = "/member/list/edit")
+ @PostMapping(value = "/member/edit")
@ApiOperation(value = "更新会员", httpMethod = "POST")
public ResponseEntity update(@Validated @RequestBody MemberDTO memberDTO) {
memberService.updateMember(memberDTO);
@@ -102,5 +102,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