From 311322c7f97dbedb3f51deb99827633252a1f016 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Feb 2021 11:51:14 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin_manage

---
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java |  142 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 142 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 358a390..2e1a9aa 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
@@ -6,6 +6,7 @@
 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.MemberAccountMoneyChangeEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
 import com.xcong.excoin.modules.member.entity.MemberEntity;
@@ -47,6 +48,16 @@
     @ControllerEndpoint(operation = "交易设置---确认", exceptionMessage = "设置失败")
     public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
         return memberService.addCoinConfirm(memberEntity);
+    }
+    
+    /**
+     * 会员列表---拨币记录
+     * @return
+     */
+    @GetMapping("memberBoBiList")
+    public FebsResponse memberBoBiList(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+        Map<String, Object> data = getDataTable(memberService.memberBoBiList(memberAccountMoneyChangeEntity, request));
+        return new FebsResponse().success().data(data);
     }
     
     /**
@@ -158,6 +169,39 @@
     }
     
     /**
+     * 充币记录---列表---17773261001
+     */
+    @GetMapping("memberApplyCoinOne")
+    public FebsResponse memberApplyCoinOne(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinOneInPage(memberCoinChargeEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 充币记录---列表---17773261002
+     */
+    @GetMapping("memberApplyCoinTwo")
+    public FebsResponse memberApplyCoinTwo(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinTwoInPage(memberCoinChargeEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 充币记录---列表---17773261003
+     */
+    @GetMapping("memberApplyCoinTee")
+    public FebsResponse memberApplyCoinTee(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinTeeInPage(memberCoinChargeEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 充币记录---列表---17773260001
+     */
+    @GetMapping("memberApplyCoinOneAll")
+    public FebsResponse memberApplyCoinOneAll(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinOneAllInPage(memberCoinChargeEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
      * 充币记录---列表
      */
     @GetMapping("memberApplyCoin")
@@ -181,6 +225,39 @@
     @GetMapping("memberApplyCoinTest")
     public FebsResponse memberApplyCoinTest(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
     	Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinAloneTestInPage(memberCoinChargeEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
+     * 提币记录---列表---17773261001
+     */
+    @GetMapping("memberWithdrawCoinOne")
+    public FebsResponse memberWithdrawCoinOne(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinOneInPage(memberCoinWithdrawEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 提币记录---列表---17773261002
+     */
+    @GetMapping("memberWithdrawCoinTwo")
+    public FebsResponse memberWithdrawCoinTwo(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinTwoInPage(memberCoinWithdrawEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 提币记录---列表---17773261003
+     */
+    @GetMapping("memberWithdrawCoinTee")
+    public FebsResponse memberWithdrawCoinTee(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinTeeInPage(memberCoinWithdrawEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 提币记录---列表---17773260001
+     */
+    @GetMapping("memberWithdrawCoinAllOne")
+    public FebsResponse memberWithdrawCoinAllOne(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberWithdrawCoinAllOneInPage(memberCoinWithdrawEntity, request));
     	return new FebsResponse().success().data(data);
     }
     
@@ -232,6 +309,71 @@
     }
     
     /**
+     * 平台详细信息---列表---17773261001
+     */
+    @GetMapping("memberDataInfoOne")
+    public FebsResponse memberDataInfoOne(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoOneInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773261001
+     */
+    @GetMapping("memberDataInfoOneReal")
+    public FebsResponse memberDataInfoOneReal(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoOneRealInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773261002
+     */
+    @GetMapping("memberDataInfoTwo")
+    public FebsResponse memberDataInfoTwo(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoTwoInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773261002
+     */
+    @GetMapping("memberDataInfoTwoReal")
+    public FebsResponse memberDataInfoTwoReal(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoTwoRealInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773261003
+     */
+    @GetMapping("memberDataInfoTee")
+    public FebsResponse memberDataInfoTee(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoTeeInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773261003
+     */
+    @GetMapping("memberDataInfoTeeReal")
+    public FebsResponse memberDataInfoTeeReal(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoTeeRealInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773260001
+     */
+    @GetMapping("memberDataInfoOneAll")
+    public FebsResponse memberDataInfoOneAll(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoOneAllInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 平台详细信息---列表---17773260001
+     */
+    @GetMapping("memberDataInfoOneAllReal")
+    public FebsResponse memberDataInfoOneAllReal(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(memberService.findMemberDataInfoOneAllRealInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
      * 平台详细信息---列表
      */
     @GetMapping("memberDataInfo")

--
Gitblit v1.9.1