From 12472ea3e4c1832f318de6c016240207514b89cf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 14:49:36 +0800
Subject: [PATCH] 20210514 云顶

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 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..b91eb96 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 = 446L;
         PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();
         BigDecimal cnyUsdt = cnyUsdtExchange.getValue();
 
@@ -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();

--
Gitblit v1.9.1