From 9ef1f7389587bd35f26bb96935a788784f57cb07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 01 Dec 2020 14:35:34 +0800
Subject: [PATCH] 20201201

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 9a0677e..e1ac069 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -74,6 +74,7 @@
 
 	private final RedisUtils redisUtils;
 	private final TdFinancialReordDao tdFinancialReordDao;
+	private final TdCoinChargeDao tdCoinChargeDao;
 
 	@Override
 	public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity,
@@ -436,9 +437,9 @@
 		}
 		// 转币 需要扣除手续费
 		amount = amount.subtract(selectById.getFeeAmount());
-		if("ROC".equals(symbol) && !"Y".equals(selectById.getIsInside())){
+		if("SER".equals(symbol) && !"Y".equals(selectById.getIsInside())){
 			// 如果是ROC  则自动转
-			String transfer = RocService.transfer(amount, address, "ROC");
+			String transfer = RocService.transfer(amount, address, "SER");
 			if(!"success".equals(transfer)){
 				FebsResponse febsResponse = new FebsResponse();
 				return  febsResponse.fail().message(transfer);
@@ -537,6 +538,19 @@
 				 financialReord.setCreateTime(new Date());
 				 financialReord.setMemId(coinAddressEntity.getMemberId());
 				 tdFinancialReordDao.insert(financialReord);
+				 // 插入冲币记录
+
+				 TdCoinCharge tdCoinCharge = new TdCoinCharge();
+				 tdCoinCharge.setAddress(address);
+				 tdCoinCharge.setAmount(amount);
+				 tdCoinCharge.setMemberId(coinAddressEntity.getMemberId());
+				 tdCoinCharge.setSymbol("USDT");
+				 tdCoinCharge.setTag("ERC20");
+				 tdCoinCharge.setTransHash("");
+				 tdCoinCharge.setCreateTime(new Date());
+				 tdCoinCharge.setLastAmount(amount);
+				 tdCoinCharge.setStatus(1);
+				 tdCoinChargeDao.insert(tdCoinCharge);
 				 // 更新钱包
 				 memberCoinAddressMapper.updateSuanliWallet(walletId,amount);
 			 }
@@ -773,7 +787,7 @@
 	
 		//USDT充币总额+USDT提币总额
     	String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");
-    	String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC");
+    	String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"SER");
     	memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
     	memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc));
     	String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
@@ -810,7 +824,7 @@
 		
 		//账户金额
 		String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
-		String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+		String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"SER");
 		memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
 		memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
 		//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
@@ -1338,7 +1352,7 @@
 
 		//USDT充币总额+USDT提币总额
 		String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"USDT");
-		String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"ROC");
+		String totalAmountUsdtBRoc = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId,"SER");
 		memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
 		memberInfoDetailVo.setChargeCoinRoc(totalAmountUsdtBRoc == null ? 0 : Double.parseDouble(totalAmountUsdtBRoc));
 		String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
@@ -1375,7 +1389,7 @@
 
 		//账户金额
 		String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"USDT");
-		String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"ROC");
+		String walletNumRoc = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId,"SER");
 		memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
 		memberInfoDetailVo.setWalletCoinNumRoc(walletNumRoc == null ? 0 : Double.parseDouble(walletNumRoc));
 		//String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);

--
Gitblit v1.9.1