gq 7 years ago
parent
commit
64d4f451d8

+ 8 - 3
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -114,9 +114,14 @@ class AuthController extends Controller
             $phone_user = UserInfoModel::where('phone',$phone)->first();
             if(!empty($phone_user)){
 //                return $this->error(ErrorCode::USER_DOES_EXIST);
-                $token = $phone_user->createToken($user->phone)->accessToken;
-                $user = $phone_user;
-                return $this->api(compact( 'user', 'code','token'));
+                if (Auth::attempt(['phone'=>$phone,'password'=>$password])) {
+                    $user = Auth::user();
+                    \Log::info($user);
+                    $token = $user->createToken($user->phone)->accessToken;
+                    return $this->api(compact( 'user', 'code','token'));
+                }else{
+                    return $this->error(ErrorCode::INCORRECT_USER_OR_PASS);
+                }
             }
         }
         if (empty($user)) {

+ 3 - 3
server/app/Http/Controllers/Api/V1/DreamController.php

xqd xqd
@@ -440,6 +440,9 @@ class DreamController extends Controller
             $dream->get_coin += $coin;
             $dream->mark += $coin*$number;
             $dream->save();
+//            在支持梦想时 如果梦主排名配取代时发送系统消息
+            dd($old_top_user_id);
+            $this->systemInfo($dream->id,$user->id,$old_top_user_id);
 
 
             //            梦想实现创建二维码
@@ -472,9 +475,6 @@ class DreamController extends Controller
                 'score'=>$coin*$number,
             ];
             $ok =   SupportDreamModel::create($data);
-
-            //            在支持梦想时 如果梦主排名配取代时发送系统消息
-            $this->systemInfo($dream->id,$user->id,$old_top_user_id);
             if (!$ok) {
                 return $this->error(ErrorCode::MERCHANT_SERVICE_STATUS_INVALID);
             }