From 4c902d9c20dd965d1ec832760809c622d1df9aac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 17 Jun 2021 11:17:03 +0800
Subject: [PATCH] 20210617 开售开关
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 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 f1d41be..1ca8f8d 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
@@ -30,6 +30,8 @@
import com.xcong.excoin.modules.trademanage.mapper.MemberWalletAgentMapper;
import com.xcong.excoin.modules.trademanage.service.TradeManageService;
import com.xcong.excoin.modules.trademanage.vo.MemberAccountInfoVo;
+
+import cn.hutool.core.collection.CollUtil;
import lombok.RequiredArgsConstructor;
@Service
@@ -62,6 +64,20 @@
if (records != null) {
for (ContractHoldOrderEntity holdOrderEntity : records) {
MemberEntity selectById = memberMapper.selectById(holdOrderEntity.getMemberId());
+
+ 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);
+ }
+
+
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
BigDecimal lotNumber = holdOrderEntity.getSymbolSku();
@@ -98,9 +114,21 @@
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberAccountInfoVo> selectMemberListInPage = memberMapper.findMemberAccountInfoListInPage(page, memberEntity);
List<MemberAccountInfoVo> records = selectMemberListInPage.getRecords();
- if(records.size() > 0) {
+ if(CollUtil.isNotEmpty(records)) {
for(MemberAccountInfoVo memberAccountInfoVo : records) {
Long memberId = memberAccountInfoVo.getId();
+
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+ String firstName = memberAuthenticationEntity.getFirstName();
+ String secondName = memberAuthenticationEntity.getSecondName();
+ String realName = firstName + secondName;
+ memberAccountInfoVo.setRealName(realName);
+ }
+
//总盈亏
String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymid(memberId);
BigDecimal bd=new BigDecimal(rewardratioByMid);
@@ -111,11 +139,12 @@
}else {
memberAccountInfoVo.setIsSuAccount(1);
}
- Map<String, Object> columnMap = new HashMap<>();
+
+ Map<String, Object> columnMaps = new HashMap<>();
columnMap.put("member_id", memberId);
- List<MemberWalletAgentEntity> selectByMap = memberWalletAgentMapper.selectByMap(columnMap);
- if(selectByMap.size() > 0) {
- BigDecimal availableBalance = selectByMap.get(0).getAvailableBalance();
+ List<MemberWalletAgentEntity> selectByMaps = memberWalletAgentMapper.selectByMap(columnMaps);
+ if(CollUtil.isNotEmpty(selectByMaps)) {
+ BigDecimal availableBalance = selectByMaps.get(0).getAvailableBalance();
memberAccountInfoVo.setAgentAvailableBalance(availableBalance);
}
@@ -129,6 +158,23 @@
MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberAccountMoneyChangeEntity> findMemberAccountInfoListInPage = memberAccountMoneyChangeMapper.findMemberAccountInfoListInPage(page, memberAccountMoneyChangeEntity);
+
+ List<MemberAccountMoneyChangeEntity> records = findMemberAccountInfoListInPage.getRecords();
+ if(CollUtil.isNotEmpty(records)) {
+ for(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntitys : records) {
+ Long memberId = memberAccountMoneyChangeEntitys.getMemberId();
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberAuthenticationEntity> selectByMap = memberAuthenticationMapper.selectByMap(columnMap );
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ MemberAuthenticationEntity memberAuthenticationEntity = selectByMap.get(0);
+ String firstName = memberAuthenticationEntity.getFirstName();
+ String secondName = memberAuthenticationEntity.getSecondName();
+ String realName = firstName + secondName;
+ memberAccountMoneyChangeEntitys.setRealName(realName);
+ }
+ }
+ }
return findMemberAccountInfoListInPage;
}
@@ -153,6 +199,22 @@
QueryRequest request) {
Page<ContractOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<ContractOrderEntity> findMemberAccountInfoListInPage = contractHoldOrderMapper.findMemberHistoryOrderInfoAllInPage(page, contractOrderEntity);
+ List<ContractOrderEntity> records = findMemberAccountInfoListInPage.getRecords();
+ if(CollUtil.isNotEmpty(records)) {
+ 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;
}
--
Gitblit v1.9.1