From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot

---
 src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index 5bcfd42..cf38e72 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -65,7 +65,7 @@
 	
 	String selectRewardratioForBasicRealDataBymid(Long memberId);
 
-	String selectTotalAmountUsdtBForBasicRealDataBymemberId(Long memberId);
+	String selectTotalAmountUsdtBForBasicRealDataBymemberId(@Param("memberId")Long memberId,@Param("symbol")String symbol);
 
 	String selectTotalAmountUsdtSForBasicRealDataBymemberId(Long memberId);
 
@@ -83,7 +83,7 @@
 
 	String selectprepriceForBasicRealDataBymemberId(Long memberId);
 
-	String selectBBZCForBasicRealDataBymemberId(Long memberId);
+	String selectBBZCForBasicRealDataBymemberId(@Param("memberId")Long memberId,@Param("symbol") String symbol);
 
 	String selectHYZCForBasicRealDataBymemberId(Long memberId);
 
@@ -94,11 +94,13 @@
 	IPage<MemberEntity> findMemberAloneTestInPage(Page<MemberEntity> page, @Param("record") MemberEntity member);
 
 	IPage<MemberDataInfoVo> selectMemberDataInfoDtoListInPageAlone(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
+	IPage<MemberDataInfoVo> findMemberDataInfoAllAloneTestListInPage(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
 	IPage<MemberDataInfoVo> selectMemberDataInfoDtoRealListInPageAlone(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
 	IPage<MemberDataInfoVo> findMemberDataInfoAloneTestDtoListInPage(Page<MemberEntity> page, @Param("record") MemberEntity memberEntity);
 
 	String selectTotalAmountUsdtBForBasicRealDataAlone();
 	String selectTotalAmountUsdtBForBasicRealTestDataAlone();
+	String selectTotalAmountUsdtBForBasicRealTestAllDataAlone();
 
 	String selectTotalAmountUsdtBForBasicData();
 
@@ -130,45 +132,59 @@
 
 	String selectTotalAmountUsdtSForBasicRealDataAlone();
 	String selectTotalAmountUsdtSForBasicRealTestDataAlone();
+	String selectTotalAmountUsdtSForBasicRealTestAllDataAlone();
 
 	String selectTotalAmountUsdtCZForBasicRealDataAlone();
 	String selectTotalAmountUsdtCZForBasicRealTestDataAlone();
+	String selectTotalAmountUsdtCZForBasicRealTestAllDataAlone();
 
 	String selectTotalAmountUsdtTXForBasicRealDataAlone();
 	String selectTotalAmountUsdtTXForBasicRealTestDataAlone();
+	String selectTotalAmountUsdtTXForBasicRealTestAllDataAlone();
 
 	String selectReturnMoneyForBasicRealDataAlone();
 	String selectReturnMoneyForBasicRealTestDataAlone();
+	String selectReturnMoneyForBasicRealTestAllDataAlone();
 
 	String selectClosingpriceForBasicRealDataAlone();
 	String selectClosingpriceForBasicRealTestDataAlone();
+	String selectClosingpriceForBasicRealTestAllDataAlone();
 
 	String selectSellClosingpriceForBasicRealDataAlone();
 	String selectSellClosingpriceForBasicRealTestDataAlone();
+	String selectSellClosingpriceForBasicRealTestAllDataAlone();
 
 	String selectRewardratioForBasicRealDataAlone();
 	String selectRewardratioForBasicRealTestDataAlone();
+	String selectRewardratioForBasicRealTestAllDataAlone();
 
 	String selectSFCCForBasicRealDataAlone();
 	String selectSFCCForBasicRealTestDataAlone();
+	String selectSFCCForBasicRealTestAllDataAlone();
 
 	String selectBBZHForBasicRealDataAlone();
 	String selectBBZHForBasicRealTestDataAlone();
+	String selectBBZHForBasicRealTestAllDataAlone();
 
 	String selectHYZHForBasicRealDataAlone();
 	String selectHYZHForBasicRealTestDataAlone();
+	String selectHYZHForBasicRealTestAllDataAlone();
 
 	String selectprepriceForBasicRealDataAlone();
 	String selectprepriceForBasicRealTestDataAlone();
+	String selectprepriceForBasicRealTestAllDataAlone();
 
 	String selectBBZCForBasicRealDataAlone();
 	String selectBBZCForBasicRealTestDataAlone();
+	String selectBBZCForBasicRealTestAllDataAlone();
 
 	String selectHYZCForBasicRealDataAlone();
 	String selectHYZCForBasicRealTestDataAlone();
+	String selectHYZCForBasicRealTestAllDataAlone();
 
 	String selectDLZCForBasicRealDataAlone();
 	String selectDLZCForBasicRealTestDataAlone();
+	String selectDLZCForBasicRealTestAllDataAlone();
 
 	String selectTotalAmountUsdtBForBasicAllDataAlone();
 
@@ -206,5 +222,13 @@
 
 	IPage<MemberAccountInfoVo> findmemberAccountInfoAloneTestListInPage(Page<MemberEntity> page,
 			@Param("record")MemberEntity memberEntity);
+
+	String selectMemberInfoDetailByInviteId(@Param("inviteId")String inviteId);
+
+	List<MemberEntity> selectMemberDataInfoListSearchs(@Param("inviteId")String inviteId);
+
+	MemberEntity selectMemberByInviteId(@Param("inviteId")String string);
+
+	IPage<MemberEntity> selectDataInfoListSearchs(Page<MemberEntity> page, @Param("record")MemberEntity member);
     
 }

--
Gitblit v1.9.1