From fa91cc62d16b55c99d4cf6451ac6e2f1e0031dd5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 15 May 2021 18:35:15 +0800
Subject: [PATCH] 20210515 云顶
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 8238b38..6dd5b92 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
@@ -93,6 +93,7 @@
public Result getWalletCoin() {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
+// Long memberId = 444L;
PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();
BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
@@ -106,10 +107,10 @@
for (MemberWalletCoinEntity memberWalletCoinEntity : memberWalletCoinlist) {
if ("USDT".equals(memberWalletCoinEntity.getWalletCode()) || "XCH".equals(memberWalletCoinEntity.getWalletCode())) {
MemberWalletCoinInfoVo memberWalletCoinInfoVo = new MemberWalletCoinInfoVo();
- memberWalletCoinInfoVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
- memberWalletCoinInfoVo.setFrozenBalance(memberWalletCoinEntity.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ memberWalletCoinInfoVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance().setScale(8, BigDecimal.ROUND_DOWN));
+ memberWalletCoinInfoVo.setFrozenBalance(memberWalletCoinEntity.getFrozenBalance().setScale(8, BigDecimal.ROUND_DOWN));
memberWalletCoinInfoVo.setMemberId(memberWalletCoinEntity.getMemberId());
- memberWalletCoinInfoVo.setTotalBalance(memberWalletCoinEntity.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
+ memberWalletCoinInfoVo.setTotalBalance(memberWalletCoinEntity.getTotalBalance().setScale(8, BigDecimal.ROUND_DOWN));
memberWalletCoinInfoVo.setWalletCode(memberWalletCoinEntity.getWalletCode());
memberWalletCoinInfoVolist.add(memberWalletCoinInfoVo);
}
@@ -127,11 +128,19 @@
}
if ("XCH".equals(walletCoin.getWalletCode())) {
- BigDecimal xch = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
- String xchNewPrice = redisUtils.getString("XCH_NEW_PRICE");
- BigDecimal totalUsdt = xch.add(new BigDecimal(xchNewPrice));
- BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);
- walletCoin.setTotalBalance(totalCny);
+// BigDecimal xch = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
+// String xchNewPrice = redisUtils.getString("XCH_NEW_PRICE");
+// BigDecimal totalUsdt = xch.add(new BigDecimal(xchNewPrice));
+// BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);
+// walletCoin.setTotalBalance(totalCny);
+
+ BigDecimal amount = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
+ // 获取最新价
+ BigDecimal closePrice = new BigDecimal(redisUtils.getString("XCH_NEW_PRICE"));
+ BigDecimal totalUsdt = BigDecimal.ZERO;
+ totalUsdt = totalUsdt.add(amount.multiply(closePrice));
+ totalUsdts = totalUsdts.add(totalUsdt);
+ walletCoin.setTotalBalance(totalUsdt.multiply(cnyUsdt));
}
// else {
// BigDecimal amount = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
@@ -858,6 +867,7 @@
public Result getAllWalletCoin() {
//获取【币币】
Long memberId = LoginUserUtils.getAppLoginUser().getId();
+// Long memberId =446L;
PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();
BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
AllWalletCoinVo allWalletCoinVo = new AllWalletCoinVo();
@@ -1025,7 +1035,7 @@
for(MemberCoinChargeEntity memberCoinChargeEntitys : records) {
CoinInListVo coinInListVo = new CoinInListVo();
coinInListVo.setSymbol(memberCoinChargeEntitys.getSymbol());
- coinInListVo.setAmount(memberCoinChargeEntitys.getAmount());
+ coinInListVo.setAmount(memberCoinChargeEntitys.getAmount().toPlainString());
coinInListVo.setContent("充币");
coinInListVo.setStatus(memberCoinChargeEntitys.getStatus());
coinInListVo.setUpdateTime(memberCoinChargeEntitys.getUpdateTime());
@@ -1049,7 +1059,7 @@
for(MemberCoinWithdrawEntity memberCoinWithdrawEntitys : records) {
CoinInListVo coinInListVo = new CoinInListVo();
coinInListVo.setSymbol(memberCoinWithdrawEntitys.getSymbol());
- coinInListVo.setAmount(memberCoinWithdrawEntitys.getAmount());
+ coinInListVo.setAmount(memberCoinWithdrawEntitys.getAmount().toPlainString());
coinInListVo.setContent("提币");
int status = memberCoinWithdrawEntitys.getStatus();
int statusOut = 0;
@@ -1085,7 +1095,7 @@
for(MemberAccountMoneyChange memberAccountMoneyChanges : records) {
CoinInListVo coinInListVo = new CoinInListVo();
coinInListVo.setSymbol(memberAccountMoneyChanges.getSymbol());
- coinInListVo.setAmount(memberAccountMoneyChanges.getAmount());
+ coinInListVo.setAmount(memberAccountMoneyChanges.getAmount().toPlainString());
coinInListVo.setContent(memberAccountMoneyChanges.getContent());
coinInListVo.setStatus(memberAccountMoneyChanges.getStatus());
coinInListVo.setUpdateTime(memberAccountMoneyChanges.getUpdateTime());
@@ -1109,7 +1119,7 @@
for(MemberAccountMoneyChange memberAccountMoneyChanges : records) {
CoinInListVo coinInListVo = new CoinInListVo();
coinInListVo.setSymbol(memberAccountMoneyChanges.getSymbol());
- coinInListVo.setAmount(memberAccountMoneyChanges.getAmount());
+ coinInListVo.setAmount(memberAccountMoneyChanges.getAmount().toPlainString());
coinInListVo.setContent(memberAccountMoneyChanges.getContent());
coinInListVo.setStatus(memberAccountMoneyChanges.getStatus());
coinInListVo.setUpdateTime(memberAccountMoneyChanges.getUpdateTime());
--
Gitblit v1.9.1