From 7ddacd5fe4e7e3a889fc79fa2098f7ef4e00bda7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Mar 2021 17:32:53 +0800
Subject: [PATCH] 20210323  页面修改

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 67dbc4d..561d738 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
@@ -13,6 +13,7 @@
 import com.xcong.excoin.common.configure.FebsConfigure;
 import com.xcong.excoin.common.entity.FebsResponse;
 import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.common.exception.GlobalException;
 import com.xcong.excoin.modules.Sms106Send;
 import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
 import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
@@ -497,7 +498,7 @@
 		String address = selectById.getAddress();
 		int status = selectById.getStatus();
 		if(status != 1) {
-			return new FebsResponse().fail().message("只有等待审核的状态才能确认!");
+			return new FebsResponse().message("只有等待审核的状态才能确认!");
 		}
 		
 		// 查询币币钱包
@@ -516,10 +517,19 @@
 			columnMap.put("address", address);
 			// 如果是内部转账 则需要将币加到内部地址
 			List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
-			if(selectByMap == null || selectByMap.isEmpty()) {
-				return new FebsResponse().fail().message("地址有误,请拒绝!");
+			Long aimMemberId = null;
+			if(CollUtil.isEmpty(selectByMap)) {
+//				return new FebsResponse().message("地址有误,请拒绝!");
+//				throw new GlobalException("地址有误,请拒绝!");
+				MemberEntity memberEntity = memberMapper.selectMemberInfoByQueryKey(address);
+				if (memberEntity == null) {
+					throw new GlobalException("地址有误或用户不存在,请拒绝!");
+				}
+
+				aimMemberId = memberEntity.getId();
+			} else {
+				aimMemberId = selectByMap.get(0).getMemberId();
 			}
-			Long aimMemberId = selectByMap.get(0).getMemberId();
 			MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
 			
 			BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(selectById.getAmount());

--
Gitblit v1.9.1