From 747dd2fa511e749ad013bd92bea83f7e6e52cc3c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 23 May 2020 00:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AE=8C=E5=96=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E5=85=88?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartyMemberConfirmServiceImpl.java         | 6 +++---
 .../com/epmet/service/impl/UserResiInfoServiceImpl.java     | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index e4dc18bd8f..c816314fca 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -144,8 +144,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		if (null != partyMemberInfoResult) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
-
-		//生成短信验证码
+		//TODO 方便测试屏蔽短信验证码
+		/*//生成短信验证码
 		Map<String, String> message = (Map<String, String>) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData();
 		if (null == message) {
 			return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
@@ -154,7 +154,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile());
 
 		//将验证码存入Redis
-		partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code"));
+		partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code"));*/
 
 		//将访问记录更新到热心居民申请行为记录表
 		saveOrUpdateVisit(fromDTO.getVisitId(), null, PartyMemberConstant.OPERATE_OPERATE_SMS_CODE);
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 af31e780ec..d8e9c105dc 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
@@ -208,7 +208,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
-		//3:调用短信服务 生成验证码发送短信
+		//TODO 2020-05-23方便测试先屏蔽短信验证码发送
+		/*//3:调用短信服务 生成验证码发送短信
 		result = messageFeignClient.sendSmsCaptcha(verificationCodeFormDTO.getMobile());
 		Map<String,Object> map = (Map<String, Object>) result.getData();
 		if (null == map || null == map.get("code")) {
@@ -217,7 +218,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//4:删除缓存中可能存在的旧验证码
 		userResiInfoRedis.deleteOldUserMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile());
 		//5:将验证码存入redis
-		userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(),verificationCodeFormDTO.getMobile(),map.get("code").toString());
+		userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(),verificationCodeFormDTO.getMobile(),map.get("code").toString());*/
 		return result;
 	}