From b25a475402ba01492abb86dbc8481740a5d180b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 01 Jun 2020 09:49:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 aa2feaa..255a52e 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
@@ -751,6 +751,9 @@
         memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
 
         PlatformFeeSettingEntity feeSetting = platformFeeSettingDao.getFeeSettingByTypeAndSymbol(2,symbol);
+        if(ObjectUtil.isEmpty(feeSetting)) {
+        	return Result.fail(MessageSourceUtils.getString("member_service_0087"));
+        }
         memberAvivableCoinInfoVo.setFee(feeSetting.getFeePrice());
         return Result.ok(memberAvivableCoinInfoVo);
     }

--
Gitblit v1.9.1