From f727a93931f801bbcd3b5eb0275169cf55a87d5e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 22 九月 2024 22:40:56 +0800
Subject: [PATCH] 1.优惠券-使用条件-根据满减还是无门槛控制 2.商品限购-根据payment_time来控制
---
src/main/java/com/mzl/flower/web/member/MemberController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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..7fcea01 100644
--- a/src/main/java/com/mzl/flower/web/member/MemberController.java
+++ b/src/main/java/com/mzl/flower/web/member/MemberController.java
@@ -8,13 +8,12 @@
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.dto.response.member.UserGrowthRecordVO;
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.*;
@@ -44,26 +43,23 @@
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();
- BeanUtils.copyProperties(memberDTO, member);
- member.create(SecurityUtils.getUserId());
- memberService.saveMember(member);
+ memberService.saveMember(memberDTO);
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) {
+ public ResponseEntity update(@RequestBody MemberDTO memberDTO) {
memberService.updateMember(memberDTO);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -72,6 +68,12 @@
@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("/getmemberGrowthRecord/list")
+ @ApiOperation(value = "会员记录列表", httpMethod = "GET")
+ public ResponseEntity<ReturnDataDTO<Page<MemberGrowthRecordVO>>> getmemberGrowthRecord(Page page, MemberRecordQueryDTO dto) {
return returnData(R.SUCCESS.getCode(), memberGrowthRecordService.queryPage(dto, page));
}
@@ -102,5 +104,18 @@
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);
+ }
+
+ @GetMapping("/userGrowthRecord/list")
+ @ApiOperation(value = "会员用户记录列表", httpMethod = "GET")
+ public ResponseEntity<ReturnDataDTO<Page<UserGrowthRecordVO>>> getUserMemberRecordList(Page page, UserMemberRecordQueryDTO dto) {
+ return returnData(R.SUCCESS.getCode(), memberGrowthRecordService.queryUserPage(dto, page));
+ }
}
--
Gitblit v1.9.3