1

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -255,7 +255,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
                             roomVo.setHostStatus(1);
                         }
                     }
-                }else if(wxUser.getPhoneNumber().equals(room.getRoomUserName())){
+                }else if(wxUser.getPhoneNumber() != null && wxUser.getPhoneNumber().equals(room.getRoomUserName())){
                     roomVo.setIsHost(1);
                     roomVo.setHostStatus(1);
                 }

src/main/java/com/fdkankan/tk/service/impl/WxUserServiceImpl.java

@@ -129,33 +129,29 @@ public class WxUserServiceImpl extends ServiceImpl<IWxUserMapper, WxUser> implem
 
     @Override
     public Object getPhone(String code,Integer reCount) {
-        try {
-            String token = wxService.getToken();
-            if(StringUtils.isBlank(token)){
-                throw new BusinessException(ResultCode.WX_PHONE_ERROR);
-            }
-            JSONObject jsonObject = wxClient.getPhone(token, new WxGetPhoneParam(code));
-            if(jsonObject.getInteger("errcode") != null && jsonObject.getInteger("errcode") == 40001 && reCount < 2){
-                log.info("wx-getPhone-error:{},当前重试次数：{}",code,reCount);
-                reCount ++;
-                wxService.delToken();
-                return getPhone(code,reCount);
-            }
-            JSONObject phoneObj = (JSONObject) jsonObject.get("phone_info");
-            if(phoneObj==null){
-                throw new BusinessException(ResultCode.WX_PHONE_ERROR);
-            }
-            log.info(phoneObj.toJSONString());
-            List<WxUser> wxUsers = this.getByPhone(phoneObj.getString("phoneNumber"));
-            if(wxUsers.size() >0){
-                throw new BusinessException(ResultCode.WX_PHONE_EXIST);
-            }
-            //return phoneObj.getString("phoneNumber");
-            return phoneObj;
-        } catch (Exception e){
-            e.printStackTrace();
+        String token = wxService.getToken();
+        if(StringUtils.isBlank(token)){
+            throw new BusinessException(ResultCode.WX_PHONE_ERROR);
+        }
+        JSONObject jsonObject = wxClient.getPhone(token, new WxGetPhoneParam(code));
+        if(jsonObject.getInteger("errcode") != null && jsonObject.getInteger("errcode") == 40001 && reCount < 2){
+            log.info("wx-getPhone-error:{},当前重试次数：{}",code,reCount);
+            reCount ++;
+            wxService.delToken();
+            return getPhone(code,reCount);
+        }
+        JSONObject phoneObj = (JSONObject) jsonObject.get("phone_info");
+        if(phoneObj==null){
+            throw new BusinessException(ResultCode.WX_PHONE_ERROR);
+        }
+
+        List<WxUser> wxUsers = this.getByPhone(phoneObj.getString("phoneNumber"));
+        if(wxUsers.size() >0){
+            log.info("getPhone-用户手机号码已存在:{}",phoneObj.toJSONString());
+            throw new BusinessException(ResultCode.WX_PHONE_EXIST);
         }
-        throw new BusinessException(ResultCode.WX_PHONE_ERROR);
+        //return phoneObj.getString("phoneNumber");
+        return phoneObj;
     }
 
     @Override