From b2b82c1308fd2cf71e118ab8df8258f8160f010a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 29 八月 2024 15:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/member/MemberController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 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 108b798..5f14fb0 100644
--- a/src/main/java/com/mzl/flower/web/member/MemberController.java
+++ b/src/main/java/com/mzl/flower/web/member/MemberController.java
@@ -6,9 +6,10 @@
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.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;
import io.swagger.annotations.ApiOperation;
@@ -34,11 +35,13 @@
private final MemberService memberService;
+ 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::getLevelName, dto.getLevelName());
+ queryWrapper.lambda().eq(isNotNull(dto.getLevelName()), Member::getName, dto.getLevelName());
page = (Page) memberService.page(page, queryWrapper);
return returnData(R.SUCCESS.getCode(), page);
}
@@ -66,5 +69,50 @@
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);
+ }
+
+ @DeleteMapping(value = "/memberGrowthRecord/delete/{id}")
+ @ApiOperation(value = "删除会员记录 ", httpMethod = "DELETE", notes = "ID")
+ public ResponseEntity deleteGrowthRecord(@PathVariable("id") Long id) {
+ memberGrowthRecordService.deleteMemberGrowthRecord(String.valueOf(id));
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PostMapping(value = "/memberGrowthRecord/save")
+ @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);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PutMapping(value = "/memberGrowthRecord/update")
+ @ApiOperation(value = "更新会员记录", httpMethod = "PUT")
+ public ResponseEntity updateGrowthRecord(@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);
+ }
}
--
Gitblit v1.9.3