From 56f2721eb37bef55fb2f2f2243acb4e944a27cde Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 29 Oct 2020 15:47:10 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 104 insertions(+), 6 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 7ce46dd..0fd7430 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;
@@ -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);
+// }
/**
* 代理关系---列表
@@ -63,6 +64,30 @@
public FebsResponse getList(MemberEntity member, QueryRequest request) {
Map<String, Object> data = getDataTable(memberService.findMemberListInPage(member, request));
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);
}
/**
@@ -141,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);
}
@@ -160,12 +195,30 @@
}
/**
+ * 提币记录---列表
+ */
+ @GetMapping("memberWithdrawCoinTest")
+ public FebsResponse memberWithdrawCoinTest(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinTestListInPage(memberCoinWithdrawEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 提币记录---列表alone
+ */
+ @GetMapping("memberWithdrawCoinAlone")
+ public FebsResponse memberWithdrawCoinAlone(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinAloneInPage(memberCoinWithdrawEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
* 提币记录---确认
* @return
*/
@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);
}
@@ -189,6 +242,51 @@
}
/**
+ * 平台全部信息---列表
+ */
+ @GetMapping("memberDataInfoAll")
+ public FebsResponse memberDataInfoAll(MemberEntity memberEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberDataInfoAllInPage(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 平台详细信息---列表alone
+ */
+ @GetMapping("memberDataInfoAlone")
+ public FebsResponse memberDataInfoAlone(MemberEntity memberEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberDataInfoAloneDtoListInPage(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 平台详细信息---列表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")
+ public FebsResponse memberDataInfoAllAlone(MemberEntity memberEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberDataInfoAllAloneListInPage(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 平台全部信息---列表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