From b448b917b7bff91ceddc90f19487ae1cbbc52b13 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Jun 2020 19:13:04 +0800
Subject: [PATCH] 20200611 代码提交
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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 cc2dd48..0d5f272 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
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.member.controller;
+import com.xcong.excoin.common.annotation.ControllerEndpoint;
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
@@ -10,10 +11,14 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
/**
* @author wzy
@@ -35,14 +40,31 @@
}
/**
- * 会员USDT充值
- * @param member
- * @param request
- * @return
+ * 会员USDT充值---列表
*/
@GetMapping("memberChargeUsdt")
public FebsResponse memberChargeUsdt(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request) {
Map<String, Object> data = getDataTable(memberService.findmemberQuickBuySaleListInPage(memberQuickBuySaleEntity, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 会员USDT充值---确认
+ * @return
+ */
+ @GetMapping("memberChargeUsdtConfirm/{id}")
+ @ControllerEndpoint(operation = "会员USDT充值---确认", exceptionMessage = "划转失败")
+ public FebsResponse memberChargeUsdtConfirm(@NotNull(message = "{required}") @PathVariable Long id) {
+ return memberService.memberChargeUsdtConfirm(id);
+ }
+
+ /**
+ * 会员USDT充值---取消
+ * @return
+ */
+ @GetMapping("memberChargeUsdtCancel/{id}")
+ @ControllerEndpoint(operation = "会员USDT充值---取消", exceptionMessage = "取消失败")
+ public FebsResponse memberChargeUsdtCancel(@NotNull(message = "{required}") @PathVariable Long id) {
+ return memberService.memberChargeUsdtCancel(id);
+ }
}
--
Gitblit v1.9.1