Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-08-29 f29339d03169792e15efe804743b5aed70a1c0a1

 src/main/java/com/mzl/flower/web/member/MemberController.java

@@ -1,23 +1,26 @@
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.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;
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,23 +37,22 @@

    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::getName, dto.getLevelName());
        page = (Page) memberService.page(page, queryWrapper);
        return returnData(R.SUCCESS.getCode(), page);
    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();
@@ -60,11 +62,49 @@
        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<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) {
        MemberGrowthRecord memberGrowthRecord = new MemberGrowthRecord();
        BeanUtils.copyProperties(memberGrowthRecordDTO, memberGrowthRecord);
        memberGrowthRecord.create(SecurityUtils.getUserId());
        memberGrowthRecordService.saveMemberGrowthRecord(memberGrowthRecord);
        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);
    }
}