From da42e614c8f81984c09d724461ada730f6c749ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 23 Feb 2022 17:57:01 +0800
Subject: [PATCH] 20222223

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java |   10 ++++++++++
 src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java    |    3 ++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
index bbcd0a9..39f42f6 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/MemberWalletCoinEnum.java
@@ -20,7 +20,8 @@
 	ZHIYATOGUSD("0006","兑换GUSD"),
 
 	WALLETCOINCODE("USDT", "USDT"),
-	
+	WALLETGUSDCOINCODE("GUSD", "GUSD"),
+
 	SUBMITSALESWALLETCOINORDER_SERVICERATE("ServiceRate","0.002"),
 	
 	//SUBMITSALESWALLETCOINORDER_TYPE_S("买入","1"),
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 a2b4b05..d38cfac 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
@@ -102,6 +102,12 @@
                         totalUsdts = totalUsdts.add(totalUsdt);
                         BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);
                         walletCoin.setTotalBalance(totalCny);
+                    }else if (MemberWalletCoinEnum.WALLETGUSDCOINCODE.getValue().equals(walletCoin.getWalletCode())) {
+                        BigDecimal totalUsdt = BigDecimal.ZERO;
+                        totalUsdt = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
+                        totalUsdts = totalUsdts.add(totalUsdt);
+                        BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);
+                        walletCoin.setTotalBalance(totalCny);
                     } else {
                         BigDecimal amount = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());
                         // 获取最新价
@@ -141,6 +147,10 @@
             memberWalletCoinlist.add(coin);
             coin.setWalletCode(CoinTypeEnum.ETC.toString());
             memberWalletCoinlist.add(coin);
+            coin.setWalletCode(CoinTypeEnum.GUSD.toString());
+            memberWalletCoinlist.add(coin);
+            coin.setWalletCode(CoinTypeEnum.GOLDRICE.toString());
+            memberWalletCoinlist.add(coin);
 
             MemberWalletCoinVo memberWalletCoinVo = new MemberWalletCoinVo();
             memberWalletCoinVo.setTotalUsdt(totalUsdts.setScale(4, BigDecimal.ROUND_DOWN));

--
Gitblit v1.9.1