From cca760c2ac6ac19ddd1428f43e867affc9f8cab4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 12:06:48 +0800
Subject: [PATCH] 20200721 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 5e20ef9..a5ac62b 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
@@ -11,6 +11,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;
@@ -769,6 +770,22 @@
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;
}
@@ -815,33 +832,33 @@
IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.selectMemberDataInfoDtoListInPageAlone(page, memberEntity);
//USDT充币总额+USDT提币总额
String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataAlone();
- String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealData();
+ String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataAlone();
//USDT充值总额+USDT提现总额
- String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealData();
- String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealData();
+ String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataAlone();
+ String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataAlone();
//佣金
- String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealData();
+ String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataAlone();
//开仓手续费总额
- String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
+ String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataAlone();
//平仓总手续费
- String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+ String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataAlone();
//总盈亏
- String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+ String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataAlone();
//持仓人数
- String notNullNumber = memberMapper.selectSFCCForBasicRealData();
+ String notNullNumber = memberMapper.selectSFCCForBasicRealDataAlone();
//币币账户不为空的人数
- String walletNumber = memberMapper.selectBBZHForBasicRealData();
+ String walletNumber = memberMapper.selectBBZHForBasicRealDataAlone();
//合约账户不为空的人数
- String walletCoinNumber = memberMapper.selectHYZHForBasicRealData();
+ String walletCoinNumber = memberMapper.selectHYZHForBasicRealDataAlone();
//持仓手续费
- String doingPrice = memberMapper.selectprepriceForBasicRealData();
+ String doingPrice = memberMapper.selectprepriceForBasicRealDataAlone();
//账户金额
- String walletNum = memberMapper.selectBBZCForBasicRealData();
- String walletCoinNum = memberMapper.selectHYZCForBasicRealData();
- String agentNum = memberMapper.selectDLZCForBasicRealData();
+ String walletNum = memberMapper.selectBBZCForBasicRealDataAlone();
+ String walletCoinNum = memberMapper.selectHYZCForBasicRealDataAlone();
+ String agentNum = memberMapper.selectDLZCForBasicRealDataAlone();
double platformProfitAndLoss = 0 ;
platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
--
Gitblit v1.9.1