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 |  239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 239 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 7ce46dd..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;
@@ -50,6 +51,16 @@
     }
     
     /**
+     * 会员列表---拨币记录
+     * @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);
+    }
+    
+    /**
      * 代理关系---列表
      * @return
      */
@@ -63,6 +74,30 @@
     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")
+    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);
     }
     
     /**
@@ -134,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")
@@ -141,6 +209,7 @@
         Map<String, Object> data = getDataTable(memberService.findMemberApplyCoinListInPage(memberCoinChargeEntity, request));
         return new FebsResponse().success().data(data);
     }
+    
     /**
      * 充币记录---列表alone
      */
@@ -151,12 +220,72 @@
     }
     
     /**
+     * 充币记录---列表
+     */
+    @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);
+    }
+    
+    /**
      * 提币记录---列表
      */
     @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);
     }
     
     /**
@@ -180,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")
@@ -189,6 +383,51 @@
     }
     
     /**
+     * 平台全部信息---列表
+     */
+    @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
      */

--
Gitblit v1.9.1