From 84ca64a40c7e3a6ba7fa41498adf5e6cbd216cef Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 21 Jul 2020 15:19:06 +0800 Subject: [PATCH] 20200721 代码提交 --- src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java index bda100f..f51b0df 100644 --- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java @@ -165,6 +165,20 @@ if (records != null) { for (ContractHoldOrderEntity holdOrderEntity : records) { + + Long memberId = holdOrderEntity.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; + holdOrderEntity.setRealName(realName); + } + + MemberEntity selectById = memberMapper.selectById(holdOrderEntity.getMemberId()); // 获取最新价 BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()))); @@ -217,10 +231,6 @@ String selectYJByMemberId = agentReturnMapper.selectYJByMemberId(); for(MemberAccountMoneyChangeEntity accountMoneyChangeEntity : records) { Long memberId = accountMoneyChangeEntity.getMemberId(); - if(memberId == 8 || "8".equals(memberId)) { - accountMoneyChangeEntity.setAmount(BigDecimal.ZERO); - accountMoneyChangeEntity.setAllAmount(selectYJByMemberId); - } String allAmount = memberAccountMoneyChangeMapper.selectAccountMoneyChangeByMemberId(memberId); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); @@ -233,6 +243,10 @@ accountMoneyChangeEntity.setRealName(realName); } accountMoneyChangeEntity.setAllAmount(allAmount); + if(memberId == 8) { + accountMoneyChangeEntity.setAmount(BigDecimal.ZERO); + accountMoneyChangeEntity.setAllAmount(selectYJByMemberId); + } } } return findMemberAccountInfoListInPage; -- Gitblit v1.9.1