From 547ca3d0620fac74e1dbef77d81bf1142224b299 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Aug 2020 16:11:12 +0800
Subject: [PATCH] 20200821

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 1ce5f47..82393d5 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -2,7 +2,10 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import javax.annotation.Resource;
 
 import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;
@@ -181,23 +184,34 @@
 
         //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
-
         PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();
         BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
+        Map<String, Object> columnMap = new HashMap<String, Object>();
+        columnMap.put("member_id", memberId);
+		List<MemberWalletContractEntity> selectByMap = memberWalletContractDao.selectByMap(columnMap);
+		BigDecimal totalCoin = BigDecimal.ZERO;
+		
+		List<MemberWalletContractInfoVo> list = new ArrayList<>();
+		if(CollUtil.isNotEmpty(selectByMap)) {
+			for(MemberWalletContractEntity memberWalletContractEntity : selectByMap) {
+				MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();
+				memberWalletContractInfoVo.setFrozenBalance(memberWalletContractEntity.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));
+				memberWalletContractInfoVo.setAvailableBalance(memberWalletContractEntity.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
+				memberWalletContractInfoVo.setTotalBalance(memberWalletContractEntity.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
+				memberWalletContractInfoVo.setTotalRMBBalance(memberWalletContractEntity.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
+				memberWalletContractInfoVo.setSymbol(memberWalletContractEntity.getWalletCode());
+				list.add(memberWalletContractInfoVo);
+				totalCoin = totalCoin.add(memberWalletContractEntity.getTotalBalance());
+			}
+		}
+		
+		MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();
+		memberWalletContractInfoVo.setTotalCoin(totalCoin.setScale(4, BigDecimal.ROUND_DOWN));
+		memberWalletContractInfoVo.setAvailableCoin(totalCoin.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
+		memberWalletContractInfoVo.setSymbol("ALLCOIN");
+		list.add(memberWalletContractInfoVo);
 
-        String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();
-        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, walletCode);
-        if (ObjectUtil.isEmpty(walletContract)) {
-            return Result.fail(MessageSourceUtils.getString("member_service_0001"));
-        }
-
-        MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();
-        memberWalletContractInfoVo.setFrozenBalance(walletContract.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));
-        memberWalletContractInfoVo.setAvailableBalance(walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
-        memberWalletContractInfoVo.setTotalBalance(walletContract.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
-        memberWalletContractInfoVo.setTotalRMBBalance(walletContract.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
-
-        return Result.ok(memberWalletContractInfoVo);
+        return Result.ok(list);
     }
 
     @Override

--
Gitblit v1.9.1