From f249c277d066e151a84b766a6b82c3bbdbe1326b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 03 九月 2024 13:24:01 +0800
Subject: [PATCH] 1.优惠券-所有修改方法dto自传id 2.优惠券-积分-批量接口改成post方法 3.优惠券-定时任务-会员优惠券每月一号凌晨未使用自动过期 4.优惠券-优惠券下单接口
---
src/main/java/com/mzl/flower/web/member/MemberController.java | 62 ++++++++++++------------------
1 files changed, 25 insertions(+), 37 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 5f14fb0..039a77d 100644
--- a/src/main/java/com/mzl/flower/web/member/MemberController.java
+++ b/src/main/java/com/mzl/flower/web/member/MemberController.java
@@ -1,14 +1,14 @@
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.*;
+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.entity.menber.MemberGrowthRecord;
import com.mzl.flower.service.menber.MemberGrowthRecordService;
import com.mzl.flower.service.menber.MemberService;
import io.swagger.annotations.Api;
@@ -16,9 +16,10 @@
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
@@ -37,23 +38,20 @@
private final MemberGrowthRecordService memberGrowthRecordService;
- @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::getName, dto.getLevelName());
- page = (Page) memberService.page(page, queryWrapper);
- return returnData(R.SUCCESS.getCode(), page);
+ @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();
@@ -63,47 +61,37 @@
return returnData(R.SUCCESS.getCode(), null);
}
- @PutMapping(value = "/member/update")
- @ApiOperation(value = "更新会员", httpMethod = "PUT")
- public ResponseEntity update(@RequestBody MemberDTO memberDTO) {
+ @PostMapping(value = "/member/edit")
+ @ApiOperation(value = "更新会员", httpMethod = "POST")
+ public ResponseEntity update(@Validated @RequestBody MemberDTO memberDTO) {
memberService.updateMember(memberDTO);
return returnData(R.SUCCESS.getCode(), null);
}
-
@PostMapping("/memberGrowthRecord/list")
@ApiOperation(value = "会员记录列表", httpMethod = "POST")
- public ResponseEntity<ReturnDataDTO> getMemberRecordList(Page page, MemberRecordQueryDTO dto) {
- QueryWrapper<MemberGrowthRecord> queryWrapper = new QueryWrapper();
- queryWrapper.lambda().eq(isNotNull(dto.getType()), MemberGrowthRecord::getType, dto.getType())
- .eq(isNotNull(dto.getSource()), MemberGrowthRecord::getSource, dto.getSource())
- .ge(isNotNull(dto.getStartRecordDate()), MemberGrowthRecord::getRecordDate, dto.getStartRecordDate())
- .le(isNotNull(dto.getEndRecordDate()), MemberGrowthRecord::getRecordDate, dto.getEndRecordDate());
- page = (Page) memberGrowthRecordService.page(page, queryWrapper);
- return returnData(R.SUCCESS.getCode(), page);
+ public ResponseEntity<ReturnDataDTO<Page<MemberGrowthRecordVO>>> getMemberRecordList(Page page, MemberRecordQueryDTO dto) {
+ return returnData(R.SUCCESS.getCode(), memberGrowthRecordService.queryPage(dto, page));
}
- @DeleteMapping(value = "/memberGrowthRecord/delete/{id}")
- @ApiOperation(value = "删除会员记录 ", httpMethod = "DELETE", notes = "ID")
- public ResponseEntity deleteGrowthRecord(@PathVariable("id") Long id) {
+ @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/save")
+ @PostMapping(value = "/memberGrowthRecord/new")
@ApiOperation(value = "保存会员记录", httpMethod = "POST")
public ResponseEntity insertGrowthRecord(@RequestBody MemberGrowthRecordDTO memberGrowthRecordDTO) {
- MemberGrowthRecord memberGrowthRecord = new MemberGrowthRecord();
- BeanUtils.copyProperties(memberGrowthRecordDTO, memberGrowthRecord);
- memberGrowthRecord.create(SecurityUtils.getUserId());
- memberGrowthRecordService.saveMemberGrowthRecord(memberGrowthRecord);
+ memberGrowthRecordService.saveMemberGrowthRecord(memberGrowthRecordDTO);
return returnData(R.SUCCESS.getCode(), null);
}
- @PutMapping(value = "/memberGrowthRecord/update")
- @ApiOperation(value = "更新会员记录", httpMethod = "PUT")
- public ResponseEntity updateGrowthRecord(@RequestBody MemberGrowthRecordDTO memberGrowthRecordDTO) {
+ @PostMapping(value = "/memberGrowthRecord/edit")
+ @ApiOperation(value = "更新会员记录", httpMethod = "POST")
+ public ResponseEntity updateGrowthRecord(@Validated @RequestBody MemberGrowthRecordDTO memberGrowthRecordDTO) {
memberGrowthRecordService.updateMemberGrowthRecord(memberGrowthRecordDTO);
return returnData(R.SUCCESS.getCode(), null);
}
--
Gitblit v1.9.3