From 1d32c206cc2c5815d43f03f17491bf933c5586d5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 Aug 2020 17:57:22 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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..73b5ade 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
@@ -188,6 +188,8 @@
BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
Map<String, Object> columnMap = new HashMap<String, Object>();
columnMap.put("member_id", memberId);
+
+ Map<String, Object> map = new HashMap<String, Object>();
List<MemberWalletContractEntity> selectByMap = memberWalletContractDao.selectByMap(columnMap);
BigDecimal totalCoin = BigDecimal.ZERO;
@@ -199,19 +201,16 @@
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());
+ memberWalletContractInfoVo.setWalletCode(memberWalletContractEntity.getWalletCode()+"/USDT");
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);
-
- return Result.ok(list);
+ map.put("memberWalletContractInfoVo", list);
+ map.put("totalCoin", totalCoin.setScale(4, BigDecimal.ROUND_DOWN));
+ map.put("availableCoin", totalCoin.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
+ return Result.ok(map);
}
@Override
@@ -461,11 +460,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