From 4c902d9c20dd965d1ec832760809c622d1df9aac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 17 Jun 2021 11:17:03 +0800
Subject: [PATCH] 20210617  开售开关

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 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..8de08ac 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
@@ -5,6 +5,7 @@
 import com.xcong.excoin.common.entity.FebsResponse;
 import com.xcong.excoin.common.entity.QueryRequest;
 import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.dto.MemberLimitDto;
 import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
@@ -22,6 +23,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;
@@ -48,7 +50,18 @@
     public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
         return memberService.addCoinConfirm(memberEntity);
     }
-    
+
+    /**
+     * 限制设置
+     * @return
+     */
+    @PostMapping("setLimit")
+    @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")
+    public FebsResponse addCoinConfirm(@Valid MemberLimitDto memberEntity) {
+         memberService.setLimit(memberEntity);
+         return new FebsResponse().success();
+    }
+
     /**
      * 代理关系---列表
      * @return
@@ -65,6 +78,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 +93,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 +178,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 +230,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 +272,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 +290,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