From 044cb4aa5da2cf5928e3e36e4007a361cd88fb24 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Jul 2020 10:46:56 +0800
Subject: [PATCH] 20200727 代码提交
---
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 364 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 294 insertions(+), 70 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 0d5f272..695610f 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,70 +1,294 @@
-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
- * @date 2020-06-10
- **/
-@Slf4j
-@Validated
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/member")
-public class MemberController extends BaseController {
-
- private final IMemberService memberService;
-
- @GetMapping("getList")
- public FebsResponse getList(MemberEntity member, QueryRequest request) {
- 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);
- }
-}
+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.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
+import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
+import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/member")
+public class MemberController extends BaseController {
+
+ private final IMemberService memberService;
+
+ /**
+ *会员列表---拨币
+ * @return
+ */
+ @PostMapping("addCoinConfirm")
+ @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")
+ public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
+ return memberService.addCoinConfirm(memberEntity);
+ }
+
+ /**
+ * 代理关系---列表
+ * @return
+ */
+ @GetMapping("agentInfoList")
+ public FebsResponse agentInfoList(AgentFriendRelationEntity agentFriendRelationEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findAgentInfoListInPage(agentFriendRelationEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ @GetMapping("getList")
+ public FebsResponse getList(MemberEntity member, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberListInPage(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);
+ }
+
+ /**
+ * 实名认证---确认
+ * @return
+ */
+ @PostMapping("memberDetailConfirm")
+ @ControllerEndpoint(operation = "实名认证---确认", exceptionMessage = "认证失败")
+ public FebsResponse memberDetailConfirm(@Valid MemberDetailConfirmDto memberDetailConfirmDto) {
+ return memberService.memberDetailConfirm(memberDetailConfirmDto);
+ }
+
+ /**
+ * 会员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);
+ }
+
+ /**
+ * 会员USDT提现---列表
+ */
+ @GetMapping("memberExtractUsdt")
+ public FebsResponse memberExtractUsdt(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findmemberQuickSaleListInPage(memberQuickBuySaleEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 会员USDT提现---确认
+ * @return
+ */
+ @GetMapping("memberExtractUsdtConfirm/{id}")
+ @ControllerEndpoint(operation = "会员USDT提现---确认", exceptionMessage = "划转失败")
+ public FebsResponse memberExtractUsdtConfirm(@NotNull(message = "{required}") @PathVariable Long id) {
+ return memberService.memberExtractUsdtConfirm(id);
+ }
+
+ /**
+ * 会员USDT提现---取消
+ * @return
+ */
+ @GetMapping("memberExtractUsdtCancel/{id}")
+ @ControllerEndpoint(operation = "会员USDT提现---取消", exceptionMessage = "取消失败")
+ public FebsResponse memberExtractUsdtCancel(@NotNull(message = "{required}") @PathVariable Long id) {
+ return memberService.memberExtractUsdtCancel(id);
+ }
+
+ /**
+ * 充币记录---列表
+ */
+ @GetMapping("memberApplyCoin")
+ public FebsResponse memberApplyCoin(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ 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);
+ }
+
+ /**
+ * 提币记录---列表
+ */
+ @GetMapping("memberWithdrawCoin")
+ public FebsResponse memberWithdrawCoin(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findmemberWithdrawCoinListInPage(memberCoinWithdrawEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 提币记录---列表
+ */
+ @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) {
+ return memberService.memberWithdrawCoinConfirm(id);
+ }
+
+ /**
+ * 提币记录---取消
+ * @return
+ */
+ @GetMapping("memberWithdrawCoinCancel/{id}")
+ @ControllerEndpoint(operation = "提币记录---取消", exceptionMessage = "取消失败")
+ public FebsResponse memberWithdrawCoinCancel(@NotNull(message = "{required}") @PathVariable Long id) {
+ return memberService.memberWithdrawCoinCancel(id);
+ }
+
+ /**
+ * 平台详细信息---列表
+ */
+ @GetMapping("memberDataInfo")
+ public FebsResponse memberDataInfo(MemberEntity memberEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberDataInfoDtoListInPage(memberEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 平台全部信息---列表
+ */
+ @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
+ */
+ @GetMapping("memberDataInfoList")
+ @ControllerEndpoint(operation = "用户详细信息---充币记录", exceptionMessage = "取消失败")
+ public FebsResponse memberDataInfoList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+
+}
--
Gitblit v1.9.1