modify

Helius

2020-10-29 56f2721eb37bef55fb2f2f2243acb4e944a27cde

 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;



import java.util.Map;

import java.util.concurrent.ExecutionException;



import javax.validation.Valid;

import javax.validation.constraints.NotNull;

@@ -43,11 +44,11 @@
     *会员列表---拨币

     * @return

     */

    @PostMapping("addCoinConfirm")

    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")

    public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {

        return memberService.addCoinConfirm(memberEntity);

    }

//    @PostMapping("addCoinConfirm")

//    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")

//    public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {

//        return memberService.addCoinConfirm(memberEntity);

//    }

    

    /**

     * 代理关系---列表

@@ -65,9 +66,27 @@
        return new FebsResponse().success().data(data);

    }

    

    @GetMapping("memberDataInfoListSearchs")

    public FebsResponse memberDataInfoListSearchs(MemberEntity member, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.memberDataInfoListSearchs(member, request));

       return new FebsResponse().success().data(data);

    }

    
    @GetMapping("getListTest")

    public FebsResponse getListTest(MemberEntity member, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberListTestInPage(member, request));

       return new FebsResponse().success().data(data);

    }

    
    @GetMapping("memberAlone")

    public FebsResponse memberAlone(MemberEntity member, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberAloneInPage(member, request));

       return new FebsResponse().success().data(data);

    }

    
    @GetMapping("memberAloneTest")

    public FebsResponse memberAloneTest(MemberEntity member, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberAloneTestInPage(member, request));

       return new FebsResponse().success().data(data);

    }

    

@@ -147,6 +166,7 @@
        Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));

        return new FebsResponse().success().data(data);

    }

    
    /**

     * 充币记录---列表alone

     */

@@ -157,12 +177,30 @@
    }

    

    /**

     * 充币记录---列表

     */

    @GetMapping("memberApplyCoinTest")

    public FebsResponse memberApplyCoinTest(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinAloneTestInPage(memberCoinChargeEntity, request));

       return new FebsResponse().success().data(data);

    }

    
    /**

     * 提币记录---列表

     */

    @GetMapping("memberWithdrawCoin")

    public FebsResponse memberWithdrawCoin(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {

        Map<String, Object> data = getDataTable(memberService.findmemberWithdrawCoinListInPage(memberCoinWithdrawEntity, request));

        return new FebsResponse().success().data(data);

    }

    
    /**

     * 提币记录---列表

     */

    @GetMapping("memberWithdrawCoinTest")

    public FebsResponse memberWithdrawCoinTest(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinTestListInPage(memberCoinWithdrawEntity, request));

       return new FebsResponse().success().data(data);

    }

    

    /**

@@ -180,7 +218,7 @@
     */

    @GetMapping("memberWithdrawCoinConfirm/{id}")

    @ControllerEndpoint(operation = "提币记录---确认", exceptionMessage = "划转失败")

    public FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") @PathVariable Long id) {

    public FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") @PathVariable Long id) throws ExecutionException, InterruptedException {

        return memberService.memberWithdrawCoinConfirm(id);

    }

    

@@ -222,6 +260,15 @@
    }

    

    /**

     * 平台详细信息---列表Test

     */

    @GetMapping("memberDataInfoAloneTest")

    public FebsResponse memberDataInfoAloneTest(MemberEntity memberEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberDataInfoAloneTestDtoListInPage(memberEntity, request));

       return new FebsResponse().success().data(data);

    }

    
    /**

     * 平台全部信息---列表alone

     */

    @GetMapping("memberDataInfoAllAlone")

@@ -231,6 +278,15 @@
    }

    

    /**

     * 平台全部信息---列表Test

     */

    @GetMapping("memberDataInfoAllAloneTest")

    public FebsResponse memberDataInfoAllAloneTest(MemberEntity memberEntity, QueryRequest request) {

       Map<String, Object> data = getDataTable(memberService.findMemberDataInfoAllAloneTestListInPage(memberEntity, request));

       return new FebsResponse().success().data(data);

    }

    
    /**

     * 用户详细信息---列表

     * @return

     */