From ac10a564db63c7f9060a2e99c9cb7cc17f9832b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 11 Nov 2020 16:07:13 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index f6b01b0..d0e42c6 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/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;
@@ -65,6 +66,12 @@
         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));
@@ -74,6 +81,12 @@
     @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);
     }
     
@@ -153,12 +166,22 @@
         Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
         return new FebsResponse().success().data(data);
     }
+    
     /**
      * 充币记录---列表alone
      */
     @GetMapping("memberApplyCoinAlone")
     public FebsResponse memberApplyCoinAlone(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
     	Map<String, Object> data = getDataTable(memberService.findmemberApplyCoinAloneInPage(memberCoinChargeEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
+     * 充币记录---列表
+     */
+    @GetMapping("memberApplyCoinTest")
+    public FebsResponse memberApplyCoinTest(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinAloneTestInPage(memberCoinChargeEntity, request));
     	return new FebsResponse().success().data(data);
     }
     
@@ -195,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);
     }
     
@@ -237,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")
@@ -246,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
      */

--
Gitblit v1.9.1