供应商结算明细优化

Cui Zhi Feng

2024-09-25 debf2b9164ab65ff3ff72845d057e73f5a7e13af

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

@@ -8,14 +8,12 @@
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.dto.response.member.UserGrowthRecordVO;
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.*;
@@ -39,8 +37,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));
    }
@@ -55,16 +53,13 @@
    @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/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);
    }
@@ -73,6 +68,12 @@
    @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("/getmemberGrowthRecord/list")
    @ApiOperation(value = "会员记录列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<MemberGrowthRecordVO>>> getmemberGrowthRecord(Page page, MemberRecordQueryDTO dto) {
        return returnData(R.SUCCESS.getCode(), memberGrowthRecordService.queryPage(dto, page));
    }

@@ -86,10 +87,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);
    }

@@ -106,5 +104,18 @@
        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);
    }

    @GetMapping("/userGrowthRecord/list")
    @ApiOperation(value = "会员用户记录列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<UserGrowthRecordVO>>> getUserMemberRecordList(Page page, UserMemberRecordQueryDTO dto) {
        return returnData(R.SUCCESS.getCode(), memberGrowthRecordService.queryUserPage(dto, page));
    }
}