From df6b118004c9098666f1bdb4b092bddfe63e508a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 20 Jan 2021 16:44:08 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 20 ++++++--------------
1 files changed, 6 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 73b5ade..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,31 +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);
-
- Map<String, Object> map = new HashMap<String, Object>();
+ 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.setTotalCoin(memberWalletContractEntity.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ memberWalletContractInfoVo.setAvailableCoin(memberWalletContractEntity.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
memberWalletContractInfoVo.setWalletCode(memberWalletContractEntity.getWalletCode()+"/USDT");
- list.add(memberWalletContractInfoVo);
- totalCoin = totalCoin.add(memberWalletContractEntity.getTotalBalance());
}
}
- 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);
+ return Result.ok(memberWalletContractInfoVo);
}
@Override
--
Gitblit v1.9.1