From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/member/MemberController.java | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 21 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 108b798..89997cc 100644
--- a/src/main/java/com/mzl/flower/web/member/MemberController.java
+++ b/src/main/java/com/mzl/flower/web/member/MemberController.java
@@ -1,23 +1,25 @@
package com.mzl.flower.web.member;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.config.security.SecurityUtils;
-import com.mzl.flower.dto.request.menber.MemberDTO;
-import com.mzl.flower.dto.request.menber.MemberQueryDTO;
+import com.mzl.flower.dto.request.menber.*;
+import com.mzl.flower.dto.response.member.MemberGrowthRecordVO;
+import com.mzl.flower.dto.response.member.MemberVO;
import com.mzl.flower.entity.menber.Member;
+import com.mzl.flower.service.menber.MemberGrowthRecordService;
import com.mzl.flower.service.menber.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
+import javax.validation.constraints.NotNull;
/**
* @author fanghaowei
@@ -34,37 +36,75 @@
private final MemberService memberService;
- @PostMapping("/member/list")
- @ApiOperation(value = "会员列表", httpMethod = "POST")
- public ResponseEntity<ReturnDataDTO> getMemberList(Page page, MemberQueryDTO dto) {
- QueryWrapper<Member> queryWrapper = new QueryWrapper();
- queryWrapper.lambda().eq(isNotNull(dto.getLevelName()), Member::getLevelName, dto.getLevelName());
- page = (Page) memberService.page(page, queryWrapper);
- return returnData(R.SUCCESS.getCode(), page);
+ private final MemberGrowthRecordService memberGrowthRecordService;
+
+ @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));
}
- @DeleteMapping(value = "/member/delete/{id}")
- @ApiOperation(value = "删除会员 ", httpMethod = "DELETE", notes = "ID")
- public ResponseEntity delete(@PathVariable("id") Long id) {
+ @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/save")
+ @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);
}
- @PutMapping(value = "/member/update")
- @ApiOperation(value = "更新会员", httpMethod = "PUT")
+ @PostMapping(value = "/member/edit")
+ @ApiOperation(value = "更新会员", httpMethod = "POST")
public ResponseEntity update(@RequestBody MemberDTO memberDTO) {
memberService.updateMember(memberDTO);
return returnData(R.SUCCESS.getCode(), null);
}
+
+
+ @PostMapping("/memberGrowthRecord/list")
+ @ApiOperation(value = "会员记录列表", httpMethod = "POST")
+ public ResponseEntity<ReturnDataDTO<Page<MemberGrowthRecordVO>>> getMemberRecordList(Page page, MemberRecordQueryDTO dto) {
+ return returnData(R.SUCCESS.getCode(), memberGrowthRecordService.queryPage(dto, page));
+ }
+
+ @GetMapping(value = "/memberGrowthRecord/delete")
+ @ApiOperation(value = "删除会员记录 ", httpMethod = "GET", notes = "ID")
+ public ResponseEntity deleteGrowthRecord(@NotNull(message = "id不能为空") Long id) {
+ memberGrowthRecordService.deleteMemberGrowthRecord(String.valueOf(id));
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PostMapping(value = "/memberGrowthRecord/new")
+ @ApiOperation(value = "保存会员记录", httpMethod = "POST")
+ public ResponseEntity insertGrowthRecord(@RequestBody MemberGrowthRecordDTO memberGrowthRecordDTO) {
+ memberGrowthRecordService.saveMemberGrowthRecord(memberGrowthRecordDTO);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PostMapping(value = "/memberGrowthRecord/edit")
+ @ApiOperation(value = "更新会员记录", httpMethod = "POST")
+ public ResponseEntity updateGrowthRecord(@Validated @RequestBody MemberGrowthRecordDTO memberGrowthRecordDTO) {
+ memberGrowthRecordService.updateMemberGrowthRecord(memberGrowthRecordDTO);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @GetMapping(value = "/member/info/{userId}")
+ @ApiOperation(value = "当前用户会员信息 ", httpMethod = "GET", notes = "ID")
+ public ResponseEntity memberInfo(@PathVariable("userId") Long userId) {
+ 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