From c923589da6a3b090efb9896e0568e8b40e260e50 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 15 Oct 2020 16:20:38 +0800
Subject: [PATCH] roc内部互转修复

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |  674 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 669 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index bd4f165..a690a26 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -1,5 +1,7 @@
 package com.xcong.excoin.modules.member.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -11,6 +13,7 @@
 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.MemberAuthenticationEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
 import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
@@ -26,7 +29,9 @@
 import com.xcong.excoin.modules.member.mapper.MemberMapper;
 import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
 import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
+import com.xcong.excoin.modules.member.service.EthService;
 import com.xcong.excoin.modules.member.service.IMemberService;
+import com.xcong.excoin.modules.member.service.RocService;
 import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
 import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
 import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
@@ -45,6 +50,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -395,6 +401,23 @@
 			QueryRequest request) {
 		Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
 		IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinListInPage(page, memberCoinChargeEntity);
+		List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(CollUtil.isNotEmpty(records)) {
+			for(MemberCoinChargeVo memberCoinChargeVo : records) {
+				Long memberId = memberCoinChargeVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinChargeVo.setRealName(realName);
+				}
+			}
+		}
+		 
         return findmemberQuickBuySaleListInPage;
 	}
 
@@ -407,6 +430,19 @@
 		List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
 		if(records != null && records.size() > 0) {
 			for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+				
+				Long memberId = memberCoinWithdrawVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinWithdrawVo.setRealName(realName);
+				}
+				
 				BigDecimal amount = memberCoinWithdrawVo.getAmount();
 				BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
 				BigDecimal subtract = amount.subtract(feeAmount);
@@ -418,13 +454,14 @@
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id) {
+	public FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id) throws ExecutionException, InterruptedException {
 		
 		MemberCoinWithdrawEntity selectById = memberCoinWithdrawMapper.selectById(id);
 		Long memberId = selectById.getMemberId();
 		String symbol = selectById.getSymbol();
 		String address = selectById.getAddress();
 		int status = selectById.getStatus();
+		BigDecimal amount = selectById.getAmount();
 		if(status != 1) {
 			return new FebsResponse().fail().message("只有等待审核的状态才能确认!");
 		}
@@ -451,8 +488,8 @@
 			Long aimMemberId = selectByMap.get(0).getMemberId();
 			MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
 			
-			BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(selectById.getAmount());
-			BigDecimal addAvailable = aimWalletCoin.getAvailableBalance().add(selectById.getAmount());
+			BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(amount.subtract(selectById.getFeeAmount()));
+			BigDecimal addAvailable = aimWalletCoin.getAvailableBalance().add(amount.subtract(selectById.getFeeAmount()));
 			aimWalletCoin.setTotalBalance(addTotal);
 			aimWalletCoin.setAvailableBalance(addAvailable);
 			
@@ -461,7 +498,7 @@
 			MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
 			memberAccountMoneyChangeEntity.setContent("收款");
 			memberAccountMoneyChangeEntity.setMemberId(aimMemberId);
-			memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
+			memberAccountMoneyChangeEntity.setAmount(amount.subtract(selectById.getFeeAmount()));
 			memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
 			memberAccountMoneyChangeEntity.setSymbol(selectById.getSymbol());
 			memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
@@ -493,6 +530,28 @@
 		if(StrUtil.isNotBlank(phone)) {
 			Sms106Send.sendWithdrawalCoinMsg(phone, time);
 		}
+		// 转币 需要扣除手续费
+		amount = amount.subtract(selectById.getFeeAmount());
+		if("ROC".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+			// 如果是ROC  则自动转
+			String transfer = RocService.transfer(amount, address, "ROC");
+		}else if("USDT".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+//			EthService ethService = new EthService();
+//			// 查询余额是否足够
+//			BigDecimal bigDecimal = ethService.tokenGetBalance(EthService.TOTAL_ADDRESS);
+//			if(bigDecimal==null ||bigDecimal.compareTo(amount)<0 ){
+//				FebsResponse fail = new FebsResponse().fail();
+//				fail.message("总钱包余额不足");
+//				return fail;
+//			}
+//			amount = amount.multiply(new BigDecimal("1000000"));
+//			String usdtStr = amount.toPlainString();
+//			if (usdtStr.contains(".")) {
+//				usdtStr = usdtStr.substring(0, usdtStr.lastIndexOf("."));
+//			}
+//			String s = ethService.tokenSend(address, usdtStr, null);
+		}
+
 		/**
 		//短信提醒
 		 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -566,7 +625,7 @@
 		}else {
 			selectById.setCertifyStatus(MemberEntity.CERTIFY_STATUS_N);
 			Map<String, Object> columnMap = new HashMap<>();
-			columnMap.put("member_id", selectById);
+			columnMap.put("member_id", selectById.getId());
 			memberAuthenticationMapper.deleteByMap(columnMap);
 		}
 		selectById.setIdcardNo(memberAuthenticationEntity.getIdcardNo());
@@ -617,6 +676,10 @@
 		String walletNum = memberMapper.selectBBZCForBasicRealData();
 		String walletCoinNum = memberMapper.selectHYZCForBasicRealData();
 		String agentNum = memberMapper.selectDLZCForBasicRealData();
+		double allCoin = 0 ;
+		allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+				+(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+				+(agentNum == null ? 0 : Double.parseDouble(agentNum));
 		
 		double platformProfitAndLoss = 0 ;
 		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
@@ -641,6 +704,7 @@
 			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
 			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
 			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+			memberDataInfoVo.setAllCoin(allCoin);
 		}
 		selectMemberListInPage.setTotal(1);
         return selectMemberListInPage;
@@ -763,4 +827,604 @@
 		return memberInfoDetailVo;
 	}
 
+
+	@Override
+	public IPage<MemberCoinChargeVo> findmemberApplyCoinAloneInPage(MemberCoinChargeEntity memberCoinChargeEntity,
+			QueryRequest request) {
+		Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findmemberApplyCoinAloneInPage(page, memberCoinChargeEntity);
+		List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(MemberCoinChargeVo memberCoinChargeVo : records) {
+				Long memberId = memberCoinChargeVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinChargeVo.setRealName(realName);
+				}
+			}
+		}
+        return findmemberQuickBuySaleListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinAloneInPage(
+			MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+		Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		
+		IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findMemberWithdrawCoinAloneInPage(page, memberCoinWithdrawEntity);
+		List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+				BigDecimal amount = memberCoinWithdrawVo.getAmount();
+				BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
+				BigDecimal subtract = amount.subtract(feeAmount);
+				memberCoinWithdrawVo.setRealAmount(subtract);
+				
+				Long memberId = memberCoinWithdrawVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinWithdrawVo.setRealName(realName);
+				}
+			}
+		}
+        return findmemberQuickBuySaleListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberEntity> findMemberAloneInPage(MemberEntity member, QueryRequest request) {
+        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.findMemberAloneInPage(page, member);
+        List<MemberEntity> records = selectMemberListInPage.getRecords();
+        if(records != null && records.size() > 0) {
+        	for(MemberEntity memberEntitys : records) {
+        		String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+        		String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
+        		memberEntitys.setRealName(firstName+secondName);
+        	}
+        }
+        return selectMemberListInPage;
+    }
+
+
+	@Override
+	public IPage<MemberDataInfoVo> findMemberDataInfoAloneDtoListInPage(MemberEntity memberEntity,
+			QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoRealListInPageAlone(page, memberEntity);
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataAlone();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataAlone();
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataAlone();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataAlone();
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataAlone();
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataAlone();
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataAlone();
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataAlone();
+		
+		//持仓人数
+		String notNullNumber = memberMapper.selectSFCCForBasicRealDataAlone();
+		//币币账户不为空的人数
+		String walletNumber = memberMapper.selectBBZHForBasicRealDataAlone();
+		//合约账户不为空的人数
+		String walletCoinNumber = memberMapper.selectHYZHForBasicRealDataAlone();
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicRealDataAlone();
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicRealDataAlone();
+		String walletCoinNum = memberMapper.selectHYZCForBasicRealDataAlone();
+		String agentNum = memberMapper.selectDLZCForBasicRealDataAlone();
+		double allCoin = 0 ;
+		allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+				+(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+				+(agentNum == null ? 0 : Double.parseDouble(agentNum));
+		
+		double platformProfitAndLoss = 0 ;
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+		List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
+		for(MemberDataInfoVo memberDataInfoVo : records) {
+			memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+			memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+			memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+			memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+			memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
+			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
+			memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
+			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : rewardratioByMid);
+			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
+			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
+			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0 ? "0" : platformProfitAndLoss+"");
+			memberDataInfoVo.setDoingPrice(doingPrice == null ? "0" : doingPrice);
+			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
+			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
+			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+			memberDataInfoVo.setAllCoin(allCoin);
+		}
+		selectMemberListInPage.setTotal(1);
+        return selectMemberListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberDataInfoVo> findMemberDataInfoAllInPage(MemberEntity memberEntity, QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoListInPage(page, memberEntity);
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicData();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicData();
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicData();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicData();
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealData();
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicData();
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicData();
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicData();
+		
+		//持仓人数
+		String notNullNumber = memberMapper.selectSFCCForBasicData();
+		//币币账户不为空的人数
+		String walletNumber = memberMapper.selectBBZHForBasicData();
+		//合约账户不为空的人数
+		String walletCoinNumber = memberMapper.selectHYZHForBasicData();
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicData();
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicData();
+		String walletCoinNum = memberMapper.selectHYZCForBasicData();
+		String agentNum = memberMapper.selectDLZCForBasicData();
+		double allCoin = 0 ;
+		allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+				+(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+				+(agentNum == null ? 0 : Double.parseDouble(agentNum));
+		
+		double platformProfitAndLoss = 0 ;
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+		List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
+		for(MemberDataInfoVo memberDataInfoVo : records) {
+			memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+			memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+			memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+			memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+			memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
+			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
+			memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
+			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : rewardratioByMid);
+			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
+			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
+			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0 ? "0" : platformProfitAndLoss+"");
+			memberDataInfoVo.setDoingPrice(doingPrice == null ? "0" : doingPrice);
+			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
+			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
+			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+			memberDataInfoVo.setAllCoin(allCoin);
+		}
+		selectMemberListInPage.setTotal(1);
+        return selectMemberListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberDataInfoVo> findMemberDataInfoAllAloneListInPage(MemberEntity memberEntity,
+			QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoListInPageAlone(page, memberEntity);
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicAllDataAlone();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicAllDataAlone();
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicAllDataAlone();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicAllDataAlone();
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicAllDataAlone();
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicAllDataAlone();
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicAllDataAlone();
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicAllDataAlone();
+		
+		//持仓人数
+		String notNullNumber = memberMapper.selectSFCCForBasicAllDataAlone();
+		//币币账户不为空的人数
+		String walletNumber = memberMapper.selectBBZHForBasicAllDataAlone();
+		//合约账户不为空的人数
+		String walletCoinNumber = memberMapper.selectHYZHForBasicAllDataAlone();
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicAllDataAlone();
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicAllDataAlone();
+		String walletCoinNum = memberMapper.selectHYZCForBasicAllDataAlone();
+		String agentNum = memberMapper.selectDLZCForBasicAllDataAlone();
+		double allCoin = 0 ;
+		allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+				+(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+				+(agentNum == null ? 0 : Double.parseDouble(agentNum));
+		
+		double platformProfitAndLoss = 0 ;
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+		List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
+		for(MemberDataInfoVo memberDataInfoVo : records) {
+			memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+			memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+			memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+			memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+			memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
+			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
+			memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
+			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : rewardratioByMid);
+			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
+			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
+			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0 ? "0" : platformProfitAndLoss+"");
+			memberDataInfoVo.setDoingPrice(doingPrice == null ? "0" : doingPrice);
+			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
+			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
+			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+			memberDataInfoVo.setAllCoin(allCoin);
+		}
+		selectMemberListInPage.setTotal(1);
+        return selectMemberListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberEntity> findMemberListTestInPage(MemberEntity member, QueryRequest request) {
+        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.findMemberListTestInPage(page, member);
+        List<MemberEntity> records = selectMemberListInPage.getRecords();
+        if(records != null && records.size() > 0) {
+        	for(MemberEntity memberEntitys : records) {
+        		String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+        		String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
+        		memberEntitys.setRealName(firstName+secondName);
+        	}
+        }
+        return selectMemberListInPage;
+    }
+
+
+	@Override
+	public IPage<MemberCoinWithdrawVo> findMemberWithdrawCoinTestListInPage(
+			MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+		Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		
+		IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findMemberWithdrawCoinTestListInPage(page, memberCoinWithdrawEntity);
+		List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+				BigDecimal amount = memberCoinWithdrawVo.getAmount();
+				BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
+				BigDecimal subtract = amount.subtract(feeAmount);
+				memberCoinWithdrawVo.setRealAmount(subtract);
+				
+				Long memberId = memberCoinWithdrawVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinWithdrawVo.setRealName(realName);
+				}
+			}
+		}
+        return findmemberQuickBuySaleListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberCoinChargeVo> findMemberApplyCoinAloneTestInPage(MemberCoinChargeEntity memberCoinChargeEntity,
+			QueryRequest request) {
+		Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinAloneTestInPage(page, memberCoinChargeEntity);
+		List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
+		if(records != null && records.size() > 0) {
+			for(MemberCoinChargeVo memberCoinChargeVo : records) {
+				Long memberId = memberCoinChargeVo.getMemberId();
+				Map<String, Object> columnMap = new HashMap<>();
+				columnMap.put("member_id", memberId);
+				List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+				if(selectByMap != null && selectByMap.size() > 0) {
+					MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+					String firstName = memberAuthenticationEntity.getFirstName();
+					String secondName = memberAuthenticationEntity.getSecondName();
+					String realName = firstName + secondName;
+					memberCoinChargeVo.setRealName(realName);
+				}
+			}
+		}
+        return findmemberQuickBuySaleListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberEntity> findMemberAloneTestInPage(MemberEntity member, QueryRequest request) {
+        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.findMemberAloneTestInPage(page, member);
+        List<MemberEntity> records = selectMemberListInPage.getRecords();
+        if(records != null && records.size() > 0) {
+        	for(MemberEntity memberEntitys : records) {
+        		String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+        		String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
+        		memberEntitys.setRealName(firstName+secondName);
+        	}
+        }
+        return selectMemberListInPage;
+    }
+
+
+	@Override
+	public IPage<MemberDataInfoVo> findMemberDataInfoAloneTestDtoListInPage(MemberEntity memberEntity,
+			QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.findMemberDataInfoAloneTestDtoListInPage(page, memberEntity);
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealTestDataAlone();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealTestDataAlone();
+    	
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealTestDataAlone();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealTestDataAlone();
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealTestDataAlone();
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealTestDataAlone();
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealTestDataAlone();
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealTestDataAlone();
+		
+		//持仓人数
+		String notNullNumber = memberMapper.selectSFCCForBasicRealTestDataAlone();
+		//币币账户不为空的人数
+		String walletNumber = memberMapper.selectBBZHForBasicRealTestDataAlone();
+		//合约账户不为空的人数
+		String walletCoinNumber = memberMapper.selectHYZHForBasicRealTestDataAlone();
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicRealTestDataAlone();
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicRealTestDataAlone();
+		String walletCoinNum = memberMapper.selectHYZCForBasicRealTestDataAlone();
+		String agentNum = memberMapper.selectDLZCForBasicRealTestDataAlone();
+		double allCoin = 0 ;
+		allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+				+(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+				+(agentNum == null ? 0 : Double.parseDouble(agentNum));
+		
+		double platformProfitAndLoss = 0 ;
+		
+		
+		
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+		List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
+		for(MemberDataInfoVo memberDataInfoVo : records) {
+			memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+			memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+			memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+			memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
+			memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
+			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
+			memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
+			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : rewardratioByMid);
+			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
+			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
+			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0 ? "0" : platformProfitAndLoss+"");
+			memberDataInfoVo.setDoingPrice(doingPrice == null ? "0" : doingPrice);
+			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
+			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
+			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+			memberDataInfoVo.setAllCoin(allCoin);
+		}
+		selectMemberListInPage.setTotal(1);
+        return selectMemberListInPage;
+	}
+
+
+	@Override
+	public IPage<MemberDataInfoVo> findMemberDataInfoAllAloneTestListInPage(MemberEntity memberEntity,
+			QueryRequest request) {
+		Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+		IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.findMemberDataInfoAllAloneTestListInPage(page, memberEntity);
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealTestAllDataAlone();
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealTestAllDataAlone();
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealTestAllDataAlone();
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealTestAllDataAlone();
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealTestAllDataAlone();
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealTestAllDataAlone();
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealTestAllDataAlone();
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealTestAllDataAlone();
+		
+		//持仓人数
+		String notNullNumber = memberMapper.selectSFCCForBasicRealTestAllDataAlone();
+		//币币账户不为空的人数
+		String walletNumber = memberMapper.selectBBZHForBasicRealTestAllDataAlone();
+		//合约账户不为空的人数
+		String walletCoinNumber = memberMapper.selectHYZHForBasicRealTestAllDataAlone();
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicRealTestAllDataAlone();
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicRealTestAllDataAlone();
+		String walletCoinNum = memberMapper.selectHYZCForBasicRealTestAllDataAlone();
+		String agentNum = memberMapper.selectDLZCForBasicRealTestAllDataAlone();
+		double allCoin = 0 ;
+		allCoin = (walletNum == null ? 0 : Double.parseDouble(walletNum))
+				+(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum))
+				+(agentNum == null ? 0 : Double.parseDouble(agentNum));
+		
+		double platformProfitAndLoss = 0 ;
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+		platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
+		platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+		List<MemberDataInfoVo> records = selectMemberListInPage.getRecords();
+		for(MemberDataInfoVo memberDataInfoVo : records) {
+			memberDataInfoVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+			memberDataInfoVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+			memberDataInfoVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+			memberDataInfoVo.setAppealCoin(totalAmountUsdtS == null ? 0 : (Double.parseDouble(totalAmountUsdtS)-6780));
+			memberDataInfoVo.setClosingPrice(closingpriceByMid == null ? "0" : closingpriceByMid);
+			memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == null ? "0" : sellClosingpriceByMid);
+			memberDataInfoVo.setFee(returnMoneyByMid == null ? "0" : returnMoneyByMid);
+			memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : rewardratioByMid);
+			memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+			memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
+			memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
+			memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0 ? "0" : platformProfitAndLoss+"");
+			memberDataInfoVo.setDoingPrice(doingPrice == null ? "0" : doingPrice);
+			memberDataInfoVo.setWalletNum(walletNum == null ? "0" : walletNum);
+			memberDataInfoVo.setWalletCoinNum(walletCoinNum == null ? "0" : walletCoinNum);
+			memberDataInfoVo.setAgentNum(agentNum == null ? "0" : agentNum);
+			memberDataInfoVo.setAllCoin(allCoin);
+		}
+		selectMemberListInPage.setTotal(1);
+        return selectMemberListInPage;
+	}
+
+
+	@Override
+	public MemberInfoDetailVo selectMemberInfoDetailByInviteId(String inviteId) {
+		String id = memberMapper.selectMemberInfoDetailByInviteId(inviteId);
+		Long memberId = Long.parseLong(id);
+		MemberInfoDetailVo memberInfoDetailVo = new MemberInfoDetailVo();
+	
+		//USDT充币总额+USDT提币总额
+    	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId);
+    	memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+    	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
+    	memberInfoDetailVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+    	//USDT充值总额+USDT提现总额
+    	String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataBymemberId(memberId);
+    	memberInfoDetailVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+    	String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataBymemberId(memberId);
+    	memberInfoDetailVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+    	//总剩余
+    	double platformProfitAndLoss = 0 ;
+    	platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+    	platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+    	platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+    	platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+    	memberInfoDetailVo.setTotalCoin(platformProfitAndLoss);
+		//佣金
+		String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setFee(returnMoneyByMid == null ? 0 : Double.parseDouble(returnMoneyByMid));
+		//开仓手续费总额
+		String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setClosingPrice(closingpriceByMid == null ? 0 : Double.parseDouble(closingpriceByMid));
+		//平仓总手续费
+		String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setSellClosingPrice(sellClosingpriceByMid == null ? 0 : Double.parseDouble(sellClosingpriceByMid));
+		
+		//总盈亏
+		String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setPlatformProfitAndLoss(rewardratioByMid == null ? 0 : Double.parseDouble(rewardratioByMid));
+		
+		//持仓手续费
+		String doingPrice = memberMapper.selectprepriceForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice));
+		
+		//账户金额
+		String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
+		String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum));
+		String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId);
+		memberInfoDetailVo.setAgentNum(agentNum == null ? 0 : Double.parseDouble(agentNum));
+			
+		return memberInfoDetailVo;
+	}
+
+
+	@Override
+	public IPage<MemberEntity> memberDataInfoListSearchs(MemberEntity member, QueryRequest request) {
+
+        Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MemberEntity> selectMemberListInPage = this.baseMapper.selectDataInfoListSearchs(page, member);
+        List<MemberEntity> records = selectMemberListInPage.getRecords();
+        Set<MemberEntity> set = new HashSet<>();
+        if(CollUtil.isNotEmpty(records)) {
+        	if(StrUtil.isNotBlank(member.getAccount())) {
+        		MemberEntity memberEntity = records.get(0);
+        		//当前查询下级关系
+        		String inviteId = memberEntity.getInviteId();
+        		List<MemberEntity> members = memberMapper.selectMemberDataInfoListSearchs(inviteId);
+        		if(CollUtil.isNotEmpty(members)) {
+        			for(MemberEntity semberEntity : members) {
+        				set.add(semberEntity);
+        			}
+        		}
+        		//当前查询上级关系
+        		String refererIds = memberEntity.getRefererIds();
+        		String[] strs = refererIds.split(",");
+        		if(ObjectUtil.isNotEmpty(strs)) {
+        			for(int i=0,len=strs.length;i<len;i++){
+        				String string = strs[i].toString();
+        				if(StrUtil.isNotEmpty(string)) {
+        					MemberEntity mem = memberMapper.selectMemberByInviteId(string);
+        					set.add(mem);
+        				}
+        			}
+        		}
+        	}
+        	if(set.size() > 0) {
+        		records.addAll(set);
+        	}
+        }
+        return selectMemberListInPage;
+	}
+
 }

--
Gitblit v1.9.1