Merge branch 'master' of http://git.meme100.com:10180/yigao/qpapi

app/Http/Controllers/Api/AgentController.php

@@ -38,9 +38,16 @@ class AgentController extends Controller
 
             // 获取用户信息.
             $getMemberInfo = $agentModel->getMember();
-            // 登陆.
-            $backData = $sportsAgentModel->loginSports($gmenuId, $getMemberInfo);
+            // 验证用户.
+            $backData = $sportsAgentModel->checkAccountSports($gmenuId, $getMemberInfo);
             if ($backData !== 1) {
+                $msg = '链接失败';
+                return toJson($code, $msg, []);
+            }//end if
+
+            // 登陆.
+            $loginBackData = $sportsAgentModel->loginSports($gmenuId, $getMemberInfo);
+            if ($loginBackData === 2) {
                 $msg = '远程登陆失败';
                 return toJson($code, $msg, []);
             }
@@ -48,7 +55,7 @@ class AgentController extends Controller
             // 獲取余额.
             $getMembersDetailed = $agentModel->getMembersDetailed();
             // 如果有余额则转入
-            if ($getMembersDetailed->membersDetailed_cash) {
+            if ($getMembersDetailed->membersDetailed_cash > 0) {
                 // 转账.
                 $backData = $sportsAgentModel->transferSports($gmenuId, $getMembersDetailed->membersDetailed_cash, 0, $getMemberInfo, 'IN');
                 if ($backData !== 1) {
@@ -60,7 +67,7 @@ class AgentController extends Controller
             $msg = '成功';
             $code = 1;
 
-            return toJson($code, $msg, []);
+            return toJson($code, $msg, ['apiToken' => $loginBackData['token']]);
         } catch (Exception $e) {
             return toJson($code, $msg, []);
         }

app/Http/Models/SportsAgent.php

@@ -52,6 +52,46 @@ class SportsAgent extends Model
     }//end getSportsToken()
 
 
+    /**
+     * 验证用户
+     *
+     * @access public
+     * @param mixed $gmenuId 游戏ID
+     * @param mixed $getMemberInfo 用户信息
+     * @return string
+     */
+    public function checkAccountSports($gmenuId, $getMemberInfo)
+    {
+        $agentModel = new HttpModel\Agent;
+        // 获取验证用户 url及参数.
+        $getGameUrlWhere = [
+            'gmenu_id' => $gmenuId,
+            'gameUrl_type' => 'checkAccount',
+        ];
+        $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
+        // 获取验证用户传参.
+        $data = json_decode($getGameUrl->gameUrl_data);
+        // 获取验证用户url.
+        $url = $getGameUrl->gameUrl_url;
+        // 验证用户.
+        $paramsData = [
+            'agent' => $data->agent,
+            'username' => $getMemberInfo['name'],
+            'method' => $data->method,
+            'password' => $getMemberInfo['password'],
+        ];
+        $commonModel = new HttpModel\Common;
+        $checkAccountUrl = $commonModel->sportsAgentParams($paramsData, $url);
+        $checkAccountData = $commonModel->make_request($checkAccountUrl, '');
+        if ($checkAccountData && json_decode($checkAccountData)->status === 1) {
+            return 1;
+        } else {
+            return 2;
+        }
+
+    }//end loginSports()
+
+
     /**
      * 登陆体育
      *
@@ -79,12 +119,16 @@ class SportsAgent extends Model
             'username' => $getMemberInfo['name'],
             'method' => $data->method,
             'password' => $getMemberInfo['password'],
+            'gametype' => $data->gameType,
         ];
         $commonModel = new HttpModel\Common;
         $loginUrl = $commonModel->sportsAgentParams($paramsData, $url);
         $loginData = $commonModel->make_request($loginUrl, '');
         if ($loginData && json_decode($loginData)->status === 1) {
-            return 1;
+            return [
+                'status' => 1,
+                'token' => json_decode($loginData)->data->token,
+            ];
         } else {
             return 2;
         }