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

陶杰

2024-09-02 6d943721ed2c41de272450143d6e204e7c4bc446

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

@@ -9,7 +9,6 @@
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;
@@ -39,8 +38,8 @@

    private final MemberGrowthRecordService memberGrowthRecordService;

    @PostMapping("/member/list")
    @ApiOperation(value = "会员列表", httpMethod = "POST")
    @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));
    }
@@ -86,10 +85,7 @@
    @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);
    }