From a824dd7101a10c534eb75a3224c10762a01af11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Wed, 12 Jul 2017 17:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=A8=81=E6=B3=A8=E5=86=8C=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=81=BF=E5=85=8D=E5=92=8C?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=E9=A1=B9=E7=9B=AE=E6=B7=B7=E5=90=88=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E7=9B=B4=E6=92=AD=E9=97=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=9B=E8=A1=8C=E6=95=B4=E5=90=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/API/GwellApi.java        | 2 +-
 src/main/java/com/ifish/controller/LiveRoom.java | 2 +-
 src/main/java/com/ifish/helper/UserHelper.java   | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ifish/API/GwellApi.java b/src/main/java/com/ifish/API/GwellApi.java
index 690505b..c74fa3e 100644
--- a/src/main/java/com/ifish/API/GwellApi.java
+++ b/src/main/java/com/ifish/API/GwellApi.java
@@ -203,7 +203,7 @@ public class GwellApi {
      * @return
      */
     public static String getEmail(String phoneNumber) {
-        String email = "ifish7" + phoneNumber + "@ifish7.com";
+        String email = "ifish7toEng" + phoneNumber + "@ifish7.com";
         return email;
     }
 
diff --git a/src/main/java/com/ifish/controller/LiveRoom.java b/src/main/java/com/ifish/controller/LiveRoom.java
index 2c9bb88..7165013 100644
--- a/src/main/java/com/ifish/controller/LiveRoom.java
+++ b/src/main/java/com/ifish/controller/LiveRoom.java
@@ -112,7 +112,7 @@ public class LiveRoom {
      * @param liveRoom
      * @return
      */
-    @RequestMapping(value = "/liveRoom/v3/updateLiveRoom.do", method = RequestMethod.GET)
+    @RequestMapping(value = "/liveRoom/v3/updateLiveRoom.do", method = RequestMethod.POST)
     public Object updateLiveRoom(MultipartFile fileUpload, Tbl_Live_Room liveRoom) {
         try {
             return liveRoomHelperI.updateLiveRoom(fileUpload, liveRoom);
diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java
index c83cdb0..233401f 100644
--- a/src/main/java/com/ifish/helper/UserHelper.java
+++ b/src/main/java/com/ifish/helper/UserHelper.java
@@ -119,6 +119,9 @@ public class UserHelper implements UserHelperI {
             //4.1未注册技威，则注册获取code1，code2
             Map gwellMap = registUserGWell(user, false);
             user = (Tbl_User) gwellMap.get("user");
+            if (StringUtils.isBlank(user.getP2pverifyCode1()) || StringUtils.isBlank(user.getP2pverifyCode2()) || StringUtils.isBlank(user.getGwellUserid())) {
+                return IfishUtil.returnJson(ResultEnum.fail101.getKey(), "");
+            }
             Integer updateInteger = tbl_User_Mapper.updateUser(user);
             //如果修改失败，返回错误信息
             if (updateInteger <= 0) {
@@ -329,7 +332,7 @@ public class UserHelper implements UserHelperI {
         userMap.put("P2PVerifyCode1", tmpUser.getP2pverifyCode1());
         userMap.put("P2PVerifyCode2", tmpUser.getP2pverifyCode2());
         userMap.put("gwellUserID", tmpUser.getGwellUserid());
-        userMap.put("userType", tmpUser.getUserType());
+        //userMap.put("userType", tmpUser.getUserType());
         if (tmpUser.getUpdateTime() != null) {
             userMap.put("updateTime", IfishUtil.format(tmpUser.getUpdateTime()));
         }