From 03f9370b85d930bd232f72721e826b5875f898cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 五月 2020 13:52:58 +0800
Subject: [PATCH] 用户登录后要验证电话号码是否已经绑定

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
index 962a7ca..1407f19 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java
@@ -90,7 +90,7 @@
 			return;
 		}
 		phone = phone.replaceAll(" ", "");
-		
+
 		if (Constant.IS_TEST) {
 			out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
 			return;
@@ -109,7 +109,7 @@
 	 */
 	@RequestSerializableByKey(key = "#acceptData.device+'-'+#phone")
 	@RequestMapping(value = "sendMSMBind", method = RequestMethod.POST)
-	public void sendMSMBind(AcceptData acceptData, String phone, boolean slideVerify, PrintWriter out) {
+	public void sendMSMBind(AcceptData acceptData, String phone, boolean slideVerify, Long uid, PrintWriter out) {
 		if (phone == null || !StringUtil.isMobile(phone.replaceAll(" ", ""))) {
 			out.print(JsonUtil.loadFalseResult(1, "鎵嬫満鍙疯緭鍏ユ湁璇紝璇蜂慨鏀�"));
 			return;
@@ -129,7 +129,7 @@
 		//
 		// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
 		UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone);
-		if (phoneUser != null) {
+		if (phoneUser != null && uid != null) {
 			out.print(JsonUtil.loadFalseResult(9001, "璇ョ數璇濆彿鐮佽鍗犵敤"));
 			return;
 		}
@@ -138,7 +138,7 @@
 			out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
 			return;
 		}
-		
+
 		sendMSNnew(phone, slideVerify, 2, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
 	}
 
@@ -148,10 +148,10 @@
 			String cachekey = null;
 			if (type == 1) {
 				// 鐧诲綍楠岃瘉鐮�
-				cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSLoginCount, phone + "" );
+				cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSLoginCount, phone + "");
 			} else if (type == 2) {
 				// 缁戝畾楠岃瘉鐮�
-				cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSBindCount, phone + "" );
+				cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSBindCount, phone + "");
 			}
 
 			if (cachekey == null) {

--
Gitblit v1.8.0