From 1fc82463c1e370a26360e8ee015be17a0dfc468c Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 11 Jun 2020 19:14:19 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin_manage.git
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 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 d0002ee..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,18 +1,24 @@
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;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
import com.xcong.excoin.modules.member.service.IMemberService;
import lombok.RequiredArgsConstructor;
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
@@ -32,4 +38,33 @@
Map<String, Object> data = getDataTable(memberService.findMemberListInPage(member, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 会员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