From dd48d2c05e7ba09b11a3f7ccffd43c1b65ab1a9a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 18 Jan 2021 17:19:28 +0800
Subject: [PATCH] 20210118

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java |   28 +++++++++-------------------
 1 files changed, 9 insertions(+), 19 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 82393d5..c4cc3dc 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
@@ -186,32 +186,23 @@
         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);
+        columnMap.put("wallet_code", "USDT");
 		List<MemberWalletContractEntity> selectByMap = memberWalletContractDao.selectByMap(columnMap);
-		BigDecimal totalCoin = BigDecimal.ZERO;
-		
-		List<MemberWalletContractInfoVo> list = new ArrayList<>();
+		MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();
 		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.setTotalCoin(memberWalletContractEntity.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
+				memberWalletContractInfoVo.setAvailableCoin(memberWalletContractEntity.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
+				memberWalletContractInfoVo.setWalletCode(memberWalletContractEntity.getWalletCode()+"/USDT");
 			}
 		}
 		
-		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);
-
-        return Result.ok(list);
+        return Result.ok(memberWalletContractInfoVo);
     }
 
     @Override
@@ -461,11 +452,10 @@
     }
 
     @Override
-    public Result findWalletContractBySymbol() {
+    public Result findWalletContractBySymbol(String symbol) {
         //获取用户ID
         Long memberId = LoginUserUtils.getAppLoginUser().getId();
-        String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();
-        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, walletCode);
+        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, symbol);
         BigDecimal availableBalance = walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN);
         return Result.ok(availableBalance);
     }

--
Gitblit v1.9.1