Merge branch 'master' of http://git.9026.com/Silent/RailwayTwo

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

@@ -44,31 +44,43 @@ class AuthController extends BaseController
         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));
 
             if(isset($data['phoneNumber'])) {
                 $user = Auth::guard('mini')->user();
                 //在数据库中若存在该手机号码的数据需要update进行修改数据、若不存在需要向数据库中添加数据
                 $user = User::where("phone","=",$data['phoneNumber'])->first();
 
-                if(!empty($user) && !empty($user->phone)){
+                if(!empty($user) && empty($user->open_id)){
                     //存在手机号码直接修改
-                    User::where('open_id',$res['openid'] )->update(['phone' => $data['phoneNumber']]);
+                    User::where('phone',$data['phoneNumber'] )->update(['open_id' => $res['openid'],'session_key'=>$res['session_key']]);
                     $user->updateToken();
                     $user = $user->getUserInfo($session_key);
                     return $this->success(['data' => $user]);
 //                    return $this->error(['msg' => '后台已经存在这个手机号码了，请换一个手机号码绑定']);
                 }
+
+
+                $user = User::where("open_id","=",$res['openid'])->first();
+                if(!empty($user) && empty($user->phone)){
+                    User::where('open_id',$res['openid'] )->update(['phone' => $data['phoneNumber'],'session_key'=>$res['session_key']]);
+                    $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' => '获取失败']);
         }
         return $this->error(['msg' => '获取失败']);