登录处理

app/Http/Controllers/Api/mini/AuthController.php

@@ -40,8 +40,7 @@ class AuthController extends BaseController
                 return $this->error(['msg' => '微信code错误']);
             }
             if(isset($res['session_key'])) $session_key = $res['session_key'];
-        }
-        if($session_key) {
+
             $data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
             Log::info('info'.json_encode($data));
             Log::info('info'.json_encode($res));
@@ -58,34 +57,34 @@ class AuthController extends BaseController
                     $user->updateToken();
                     $user = $user->getUserInfo($session_key);
                     return $this->success(['data' => $user]);
-//                    return $this->error(['msg' => '后台已经存在这个手机号码了，请换一个手机号码绑定']);
-                }
+                } else {
 
-                //用openid区查找用户是否存在，存在更新openid
-                $user = User::where("open_id","=",$res['openid'])->first();
-                if(!empty($user)){
-                    if(empty($user->phone)){
-                        User::where('open_id',$res['openid'] )->update(['phone' => $data['phoneNumber'],'session_key'=>$res['session_key']]);
-                    }
+                    //不存在手机号码直接添加数据
+                    $user = User::firstOrCreate([
+                        'open_id' => $res['openid']
+                    ], [
+                        'open_id' => $res['openid'],
+                        'session_key'=>$res['session_key'],
+                        'phone' => $data['phoneNumber'],
+                        //'password' => bcrypt('123456'),
+                    ]);
                     $user->updateToken();
                     $user = $user->getUserInfo($session_key);
-                    return $this->success(['data' => $user]);
                 }
-
-                //不存在手机号码直接添加数据
-                $user = User::firstOrCreate([
-                    'open_id' => $res['openid']
-                ], [
-                    'open_id' => $res['openid'],
-                    'session_key'=>$res['session_key'],
-                    'phone' => $data['phoneNumber'],
-                ]);
-
-                $user = $user->getUserInfo($session_key);
                 return $this->success(['data' => $user]);
             }
 
             return $this->error(['msg' => '获取失败']);
+
+        }
+        if($session_key) {
+            $data = $app->encryptor->decryptData($session_key, $request->input('iv'), $request->input('encryptedData'));
+            Log::info('info'.json_encode($data));
+            $user = User::where("phone","=",$data['phoneNumber'])->first();
+            if(empty($user)){
+                return $this->error(['msg' => '账号错误，请重新登录']);
+            }
+            return $this->success(['data' => $user]);
         }
         return $this->error(['msg' => '获取失败']);
     }