From e3bf96ad189e12d7c2201734e9121063e7f39a37 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 13 Nov 2020 15:32:03 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 19 +++++++++++++------
1 files changed, 13 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 695610f..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,12 @@
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")
@@ -211,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);
}
--
Gitblit v1.9.1