From 94540972a0331f1f91bca6606722dde65d55530b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jul 2020 18:27:13 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 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 df88faf..2f2f735 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
@@ -297,7 +297,7 @@
 		
 		BigDecimal total = walletCoin.getTotalBalance().subtract(selectById.getAmount()).subtract(selectById.getFeeAmount());
 		walletCoin.setTotalBalance(total);
-		BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount()).subtract(selectById.getFeeAmount());
+		BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount());
 		walletCoin.setFrozenBalance(frozen);
 		
 		memberWalletCoinMapper.updateById(walletCoin);
@@ -378,7 +378,7 @@
 		
 		BigDecimal available = walletCoin.getAvailableBalance().add(selectById.getAmount()).add(selectById.getFeeAmount());
 		walletCoin.setAvailableBalance(available);
-		BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount()).subtract(selectById.getFeeAmount());
+		BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount());
 		walletCoin.setFrozenBalance(frozen);
 		
 		memberWalletCoinMapper.updateById(walletCoin);
@@ -501,4 +501,19 @@
         return selectMemberListInPage;
 	}
 
+	@Override
+	public MemberEntity selectMemberByid(long id) {
+		MemberEntity selectById = memberMapper.selectById(id);
+		return selectById;
+	}
+
+	@Override
+	public FebsResponse memberDataInfoList(@NotNull(message = "{required}") long id) {
+		Map<String, Object> columnMap = new HashMap<>();
+		columnMap.put("member_id", id);
+		columnMap.put("STATUS", 2);
+		List<MemberCoinWithdrawEntity> selectByMap = memberCoinWithdrawMapper.selectByMap(columnMap);
+		return new FebsResponse().data(selectByMap);
+	}
+
 }

--
Gitblit v1.9.1