彭俊 hace 6 años
padre
commit
9ee39b83e1

+ 1 - 0
Application/Api/Controller/Account.php

@@ -242,6 +242,7 @@ class Account extends BaseController {
         };
 
         $result = $this->accountManager->refreshToken();
+        dd($result);
         Render($result['data'], $result['status'], $result['msg']);
     }
 

+ 2 - 26
Application/Sports/Controller/MatchList.php

@@ -13,7 +13,6 @@ use Biz\Match\GetOddsData;
  * Date: 2019/3/22
  */
 class  MatchList extends Controller {
-//$this->source 数据源
 
     private $getTypeData;
     public function init() {
@@ -776,17 +775,15 @@ class  MatchList extends Controller {
             $model_result = $models['model_result'];
 
 
-            $oddsTypeWhere = $this->getOddsTypeWhere($model_odds,$oddsType);
+            //取消按状态查询赔率数据
+            //$oddsTypeWhere = $this->getOddsTypeWhere($model_odds,$oddsType);
             $oddsData = lm($model_odds, 'Sports')
                 ->select('sort','p_code','id','odds_only','odds_code',$model_odds.'.status','odds','condition','sort','source','utime')
                 ->where($this->source)
-//                ->where($oddsTypeWhere)
-//                ->where($model_odds.'.expire_time','>',date("Y-m-d H:i:s"))
                 ->where([$model_odds.'.match_id'=>$matchID,$model_odds.'.type'=>0])//,$model_odds.'.expire_time'=>$utime
                 ->orderBy('sort', 'desc')
                 ->orderBy('p_code','desc')
                 ->orderBy('odds_code','desc')
-                //->groupBy('sort','p_code','id','odds_only','odds_code',$model_odds.'.status','odds','condition','sort','source','utime')
                 ->get()->toArray();
 
             $matchData = lm($model_match, 'Sports')
@@ -795,7 +792,6 @@ class  MatchList extends Controller {
                 ->where($model_match.'.source',$this->source['source'])
                 ->where(['match_id'=>$matchID])
                 ->first();
-//                ->toarray();
 
             if(empty($matchData)) Render(null, '1', lang('Tips','Sports')->get('success'));
 
@@ -854,7 +850,6 @@ class  MatchList extends Controller {
                     ->get()
                     ->toarray();
             }
-//            dump(lm($model_match,'Sports')->getsql());die;
             $list = array();
             foreach ($oddsData as $key=>$item){
                 $item['team'] = '';
@@ -864,30 +859,12 @@ class  MatchList extends Controller {
                 if(strpos($item['odds_code'],'guest') !== false) {
                     $item['team'] = 'guest';
                 }
-                //匹配语言文件
-//                $item['p_code'] = lang('OddsTemp','Sports')->get($item['p_code']);
-//                $item['odds_code'] = lang('OddsTemp','Sports')->get($item['odds_code']);
                 $list[$key] = $item;
             }
 
-            //按p_code分组
-//            $p_code=array();
-//            foreach($list as $k=>$v){
-//                $p_code[$v['p_code']][]=$v;
-//            }
-//
-//            $sd = [];
-//            foreach ($p_code as $k1=>$v1){
-//                foreach ($v1 as $k2=>$v2){
-//                    $sd[$v2['p_code']][$v2['odds_code']][] = $v2;
-//                }
-//            }
-
             $p_code_array = [];
             foreach ($oddsData as $key =>$val){
                 $p_code_array[] = $val['p_code'];
-//                $p_code_array[$val['p_code']] = lang('OddsTemp','Sports')->get($val['p_code']);
-
             }
 
             $p_code_array = array_keys(array_flip(array_unique($p_code_array)));//p_code 去重排序
@@ -904,7 +881,6 @@ class  MatchList extends Controller {
                 'p_code_array'=> $p_code_array,
                 'oddsData'=>$oddsData,
                 'league' => $league,
-//                'lang' => lang('OddsTemp','Sports')->getAll(),
             ];
             Render($data, '1', lang('Tips','Sports')->get('success'));
 

+ 14 - 0
Application/Sports/Controller/WriteSports.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/5/13
+ * Time: 10:19
+ */
+use BaseController\Controller;
+
+class WriteSports extends Controller{
+    public function add(){
+
+    }
+}

+ 0 - 3
Biz/Account/Repository/AccountRepository.php

@@ -216,12 +216,9 @@ class AccountRepository {
      * @throws \Exception
      */
     public function updateEffectiveTime($accountIdentity, $token) {
-        echo 1;
         lm('account_token', 'Commons')->where('account_identity', $accountIdentity)->update(['effective_time' => strtotime('now'), 'last_time' => date('Y-m-d H:i:s')]);
         lm('account_detailed', 'Commons')->where('account_identity', $accountIdentity)->update(['last_time' => date('Y-m-d H:i:s')]);
-        echo 3;
         $userInfo = $this->tokenManager->getAccountInfo($token);
-        echo 2;
         if (!$userInfo)
             return ['data' => '', 'status' => '-4001', 'msg' => lang()->get('-4001')];
         $data = $_SESSION['uinfo'] = $userInfo->toArray();