From dd41e5ea8d54781ec32ffd90a49c9fa91455e378 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 7 Apr 2020 10:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF=E6=8F=90=E4=BA=A4=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/UserResiInfoServiceImpl.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 816f205162..7e36d04c2b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -165,10 +165,18 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
 			return result;
 		}
-		//2:校验成功 数据存入居民注册表 更新行为记录表数据
+		//2:再次判断手机号是否可用
+		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
+			//手机号验证失败则更新行为记录表数据 返回前台结果
+			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
+			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue());
+			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName());
+			return result;
+		}
+		//3:校验成功 数据存入居民注册表 更新行为记录表数据
 		saveUserResiInfo(userResiInfoDTO);
 		userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
-		//3:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+		//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
 		registerRelationService.saveRegisterRelation(userResiInfoDTO);
 		return result;
 	}