From 2d3de81973303a8f4e124473d69b2b9f77c38e99 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 Aug 2020 17:50:14 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 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 1ce5f47..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
@@ -2,7 +2,10 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
import javax.annotation.Resource;
import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;
@@ -181,23 +184,33 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
-
PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();
BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
-
- String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();
- MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, walletCode);
- if (ObjectUtil.isEmpty(walletContract)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0001"));
- }
-
- MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();
- memberWalletContractInfoVo.setFrozenBalance(walletContract.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));
- memberWalletContractInfoVo.setAvailableBalance(walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
- memberWalletContractInfoVo.setTotalBalance(walletContract.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
- memberWalletContractInfoVo.setTotalRMBBalance(walletContract.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
-
- return Result.ok(memberWalletContractInfoVo);
+ 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;
+
+ List<MemberWalletContractInfoVo> list = new ArrayList<>();
+ 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);
}
@Override
@@ -447,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