From caa90edd0fcd0e4f4e920bcc744eef12fee82ae6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 25 May 2020 11:07:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 b24e3ef..7f8ea9e 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
@@ -132,27 +132,31 @@
}
@Override
- public Result getWalletCoinById(Long id) {
+ public Result getWalletCoinBySymbol(String symbol) {
try {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectById(id);
-
+ MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId,symbol);
+ MemberWalletCoinInfoVo memberWalletCoinInfoVo = new MemberWalletCoinInfoVo();
+ memberWalletCoinInfoVo.setFrozenBalance(walletCoin.getFrozenBalance());
+ memberWalletCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
+ memberWalletCoinInfoVo.setMemberId(memberId);
+ memberWalletCoinInfoVo.setWalletCode(symbol);
if(!StrUtil.isEmpty(memberId.toString())) {
CnyUsdtExchange cnyUsdtExchange =cnyUsdtExchangeDao.getCNYAndUSDTOne();
BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
BigDecimal total = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
if(MemberWalletCoinEnum.WALLETCOINCODE.getValue().equals(walletCoin.getWalletCode())) {
- walletCoin.setTotalBalance(total.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
+ memberWalletCoinInfoVo.setTotalBalance(total.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
}else {
BigDecimal closePrice = new BigDecimal("10.0000");
//Double closePrice = symbolsService.getCloseSymbolsBySymbolsName(wallet.getCode()+"/USDT");
- walletCoin.setTotalBalance(total.multiply(closePrice).multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
+ memberWalletCoinInfoVo.setTotalBalance(total.multiply(closePrice).multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
}
}
- return Result.ok(walletCoin);
+ return Result.ok(memberWalletCoinInfoVo);
} catch (Exception e) {
e.printStackTrace();
return Result.fail(MessageSourceUtils.getString("member_service_0003"));
--
Gitblit v1.9.1