From 9e29441646434d9f54a2c3e855a724633885d8a4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 13 八月 2019 19:43:49 +0800
Subject: [PATCH] 缓存开发测试完成

---
 WebService/src/main/java/com/java110/web/smo/impl/RegisterServiceSMOImpl.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/smo/impl/RegisterServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/RegisterServiceSMOImpl.java
index 1ef4692..820eaca 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/RegisterServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/RegisterServiceSMOImpl.java
@@ -1,9 +1,11 @@
 package com.java110.web.smo.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.common.cache.CommonCache;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.util.Assert;
+import com.java110.common.util.StringUtil;
 import com.java110.core.context.IPageData;
 import com.java110.core.factory.AliSendMessageFactory;
 import com.java110.core.factory.AuthenticationFactory;
@@ -55,9 +57,49 @@
             return responseEntity;
         }
 
+        responseEntity = this.checkNameAndTelExists(pd,registerInfo.getString("username"),"");
+        if(responseEntity.getStatusCode()!=HttpStatus.OK){
+            return responseEntity;
+        }
+
+        responseEntity = this.checkNameAndTelExists(pd,"",registerInfo.getString("tel"));
+        if(responseEntity.getStatusCode()!=HttpStatus.OK){
+            return responseEntity;
+        }
+
+
         registerInfo.put("passwd", AuthenticationFactory.passwdMd5(registerInfo.getString("passwd")));
+
+        registerInfo.put("name",registerInfo.getString("username"));
+        registerInfo.put("password",registerInfo.getString("passwd"));
         responseEntity = this.callCenterService(restTemplate,pd,registerInfo.toJSONString(), ServiceConstant.SERVICE_API_URL+"/api/user.service.register", HttpMethod.POST);
         return responseEntity;
+    }
+
+    private ResponseEntity<String> checkNameAndTelExists(IPageData pd,String name,String tel){
+        ResponseEntity<String> responseEntity = null;
+        //鏍¢獙鐢ㄦ埛鍚嶆垨鎵嬫満鏄惁瀛樺湪
+        responseEntity = this.callCenterService(restTemplate,pd,"",
+                ServiceConstant.SERVICE_API_URL+"/api/check.hasUser.byNameOrTel?name="+name+"&tel="+tel,
+                HttpMethod.GET);
+
+        if(responseEntity.getStatusCode()!=HttpStatus.OK){
+            logger.error("璋冪敤鍚庣鏈嶅姟寮傚父锛歿}",responseEntity);
+            return new ResponseEntity<String>("璋冪敤涓績鏈嶅姟寮傚父",HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+
+        Assert.jsonObjectHaveKey(responseEntity.getBody(),"userCount","璋冪敤涓績鏈嶅姟寮傚父锛屾姤鏂囦腑鏈寘鍚玼serCount鑺傜偣");
+
+        JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
+
+        if(userInfo.getIntValue("userCount") > 0){
+            return new ResponseEntity<String>(StringUtil.isNullOrNone(name)?"鎵嬫満鍙峰凡鍗犵敤":"鐢ㄦ埛鍚嶅凡鍗犵敤",HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+
+        responseEntity = new ResponseEntity<>("鎴愬姛",HttpStatus.OK);
+
+        return responseEntity;
+
     }
 
     /**
@@ -69,6 +111,9 @@
     public ResponseEntity<String> sendTelMessageCode(IPageData pd) {
 
         Assert.jsonObjectHaveKey(pd.getReqData(),"tel","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満鍙蜂俊鎭�");
+
+
+
         JSONObject telInfo = JSONObject.parseObject(pd.getReqData());
 
         String verifyCode = AliSendMessageFactory.generateMessageCode();

--
Gitblit v1.8.0