1

app/api/controller/wechat/WechatController.php

@@ -80,7 +80,6 @@ class WechatController
         $openid = $wechatInfo['openid'];
         event('WechatOauthAfter', [$openid, $wechatInfo, $spreadId, $login_type]);
         $user = User::where('uid', WechatUser::openidToUid($openid, 'openid'))->find();
-        return app('json')->fail((string)WechatUser::openidToUid($openid, 'openid'));
         if (!$user)
             return app('json')->fail('获取用户信息失败');
         if ($user->login_type == 'h5' && ($h5UserInfo = User::where(['account' => $user->phone, 'phone' => $user->phone, 'user_type' => 'h5'])->find()))

app/models/user/WechatUser.php

@@ -69,7 +69,7 @@ class WechatUser extends BaseModel
      */
     public static function openidTouid($openid, $openidType = 'openid')
     {
-        return self::where($openidType, $openid)->where('user_type', '<>', 'h5')->value('uid');
+        return self::where($openidType, $openid)->value('uid');
     }
 
     /**