From c952838555e557097f84a47624bc2860e0a2d9a8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 30 六月 2020 15:50:46 +0800
Subject: [PATCH] 云发单异步 + 首单

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SMSController.java |   89 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 85 insertions(+), 4 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 1395019..2ab4c77 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
@@ -15,6 +15,8 @@
 import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
 import com.yeshi.fanli.service.inter.user.SMSService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -40,6 +42,10 @@
 	@RequestSerializableByKey(key = "#phone+'-'+#uid+'-'+#type")
 	@RequestMapping(value = "sendSMS", method = RequestMethod.POST)
 	public void sendMSM(AcceptData acceptData, String phone, Long uid, Integer type, PrintWriter out) {
+		if (Constant.IS_TEST) {
+			out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+			return;
+		}
 		sendMSM(acceptData, phone, uid, type, StringUtil.Md5(phone + "-" + "-" + uid + "-" + type), out);
 	}
 
@@ -85,6 +91,11 @@
 		}
 		phone = phone.replaceAll(" ", "");
 
+		if (Constant.IS_TEST) {
+			out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+			return;
+		}
+
 		sendMSNnew(phone, slideVerify, 1, StringUtil.Md5(phone + "-" + acceptData.getDevice()), out);
 	}
 
@@ -98,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;
@@ -118,8 +129,13 @@
 		//
 		// 鍒ゆ柇鎵嬫満鍙风爜鏄惁琚皝绂�
 		UserInfo phoneUser = userInfoService.getEffectiveUserInfoByPhone(phone);
-		if (phoneUser != null) {
+		if (phoneUser != null && uid != null) {
 			out.print(JsonUtil.loadFalseResult(9001, "璇ョ數璇濆彿鐮佽鍗犵敤"));
+			return;
+		}
+
+		if (Constant.IS_TEST) {
+			out.print(JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
 			return;
 		}
 
@@ -132,10 +148,10 @@
 			String cachekey = null;
 			if (type == 1) {
 				// 鐧诲綍楠岃瘉鐮�
-				cachekey = "sendMSNLoginCount" + phone;
+				cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSLoginCount, phone + "");
 			} else if (type == 2) {
 				// 缁戝畾楠岃瘉鐮�
-				cachekey = "sendMSNBindCount" + phone;
+				cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSBindCount, phone + "");
 			}
 
 			if (cachekey == null) {
@@ -178,4 +194,69 @@
 			e.printStackTrace();
 		}
 	}
+	
+	
+	
+	/**
+	 * 娉ㄩ攢璐︽埛鐭俊楠岃瘉
+	 * @param acceptData
+	 * @param uid
+	 * @param phone
+	 * @param out
+	 */
+	@RequestMapping(value = "sendMSMRemove")
+	public void sendMSMRemove(String callback, AcceptData acceptData, Long uid, String phone, PrintWriter out) {
+		if (Constant.IS_TEST) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+			return;
+		}
+		
+		if (uid == null || uid <= 0) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+		
+		if (phone == null || !StringUtil.isMobile(phone.replaceAll(" ", ""))) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇疯緭鍏ユ纭墜鏈哄彿"));
+			return;
+		}
+		phone = phone.replaceAll(" ", "").trim();
+		
+		UserInfo userInfo = userInfoService.selectAvailableByPrimaryKey(uid);
+		if (userInfo == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛涓嶅瓨鍦�"));
+			return;
+		}
+		
+		if (!phone.equals(userInfo.getPhone())) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇疯緭鍏ユ纭墜鏈哄彿"));
+			return;
+		}
+		
+		try {
+			int count = 0;
+			String cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSBindRemove, phone + "");
+			String cacheValue = redisManager.getCommonString(cachekey);
+			if (!StringUtil.isNullOrEmpty(cacheValue)) {
+				count = Integer.parseInt(cacheValue);
+				// 闄愬埗3娆�
+				if (count >= 3) {
+					JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "楠岃瘉鐮佹鏁拌秴闄�,璇风◢鍚庡啀璇�"));
+					return;
+				}
+			}
+			// 缂撳瓨涓�涓皬鏃�
+			count++;
+			redisManager.cacheCommonString(cachekey, count + "", 60 * 60);
+			// 鍙戦�侀獙璇佺爜
+			smsService.sendRemoveVCode(phone, 4);
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍙戦�佹垚鍔�"));
+		} catch (SMSException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鍙戦�佸け璐�"));
+			e.printStackTrace();
+		}
+	}
+
 }

--
Gitblit v1.8.0