From a53fb9086c7b174ea0bd3d1f80c90af9f0daac23 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 17:10:08 +0800
Subject: [PATCH] 20200721 代码提交
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 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..90ccba0 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())));
@@ -202,6 +216,22 @@
QueryRequest request) {
Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<ContractOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderMapper.findHistoryOrderInfoAloneInfoInPage(page, contractOrderEntity);
+ List<ContractOrderEntity> records = findMemberAccountInfoListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(ContractOrderEntity contractOrderEntitys : records) {
+ Long memberId = contractOrderEntitys.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;
+ contractOrderEntitys.setRealName(realName);
+ }
+ }
+ }
return findMemberAccountInfoListInPage;
}
@@ -217,10 +247,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 +259,10 @@
accountMoneyChangeEntity.setRealName(realName);
}
accountMoneyChangeEntity.setAllAmount(allAmount);
+ if(memberId == 8) {
+ accountMoneyChangeEntity.setAmount(BigDecimal.ZERO);
+ accountMoneyChangeEntity.setAllAmount(selectYJByMemberId);
+ }
}
}
return findMemberAccountInfoListInPage;
--
Gitblit v1.9.1