From 98e3ca12ee10d7e304b61797f2cbe37fda629a25 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 11:44:44 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   15 +++++++++------
 1 files changed, 9 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 c4d3fa1..29b20b2 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
@@ -1085,16 +1085,19 @@
         	}
         	Long memberInfoId = selectMemberInfoByAccount.getId();
         	String symbol = memberSubmitCoinApplyInDto.getSymbol();
-        	
+
+        	String addressIn = "";
         	Map<String, Object> columnMapAddress = new HashMap<>();
         	columnMapAddress.put("member_id", memberInfoId);
         	columnMapAddress.put("symbol", symbol);
-			List<MemberCoinAddressEntity> selectByMap2 = memberCoinAddressDao.selectByMap(columnMapAddress );
+			List<MemberCoinAddressEntity> selectByMap2 = memberCoinAddressDao.selectByMap(columnMapAddress);
 			if(CollUtil.isEmpty(selectByMap2)) {
-				return Result.fail(MessageSourceUtils.getString("member_service_0087"));
-			}
-			MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
-			String addressIn = memberCoinAddressEntity.getAddress();
+//				return Result.fail(MessageSourceUtils.getString("member_service_0087"));
+                addressIn = address;
+			} else {
+                MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
+                addressIn = memberCoinAddressEntity.getAddress();
+            }
         	
             MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyInDto.getSymbol());
             BigDecimal availableBalance = walletCoin.getAvailableBalance();

--
Gitblit v1.9.1