From 9341323065e2c25f25b4ce907c27adc7bc45b672 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Sep 2020 11:46:51 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 13 +++----------
1 files changed, 3 insertions(+), 10 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..27e8242 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
@@ -190,27 +190,20 @@
columnMap.put("member_id", memberId);
Map<String, Object> map = new HashMap<String, Object>();
+ map.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.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