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

cloudroam

2024-09-04 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2

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

@@ -44,26 +44,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);
    }
@@ -102,5 +99,12 @@
        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);
    }
}