追加推送 6/10

app/Http/Controllers/Api/WriteSportsController.php

@@ -61,17 +61,17 @@ class WriteSportsController extends BaseController{
                 foreach ($matchData as $k=>$v){
                     if($v == []) unset($matchData[$k]);
                 }
-
                 sort($matchData);
+
                 //根据顺序写入数据
                 //降维数据
-                $ddd = [];
+                $mentData = [];
                 foreach ($matchData as $k=>$v){
                     foreach ($v as $kk=>$vv){
-                        $ddd[] = $vv;
+                        $mentData[] = $vv;
                     }
                 }
-                foreach ($ddd as $kk =>$vv){
+                foreach ($mentData as $kk =>$vv){
                     switch ($vv['title']){
                         case 'area'://地区
                             throw new \Exception(Response::generate('地区数据-area:',Response::AUTH_ERROR)) ;
@@ -109,49 +109,6 @@ class WriteSportsController extends BaseController{
                             throw new \Exception(Response::generate('',Response::ABNORMAL)) ;
                     }
                 }
-
-//                return Response::success($ddd);
-
-//                foreach ($matchData as $k=>$v){
-//                    foreach ($v as $kk =>$vv){
-//                        switch ($vv['title']){
-//                            case 'area'://地区
-//                                throw new \Exception(Response::generate('地区数据-area:',Response::AUTH_ERROR)) ;
-//                                break;
-//                            case 'country'://国家
-//                                throw new \Exception(Response::generate('国家数据-country:',Response::AUTH_ERROR));
-//                                break;
-//                            case 'league'://联赛
-//                                $this->league($vv);
-//                                break;
-//                            case 'competition'://赛事
-//                                $this->competition($vv);
-//                                break;
-//                            case 'odds'://赔率
-//                                $this->odds($vv);
-//                                break;
-//                            case 'league_result'://联赛结果
-//                                $this->league_result($vv);
-//                                break;
-//                            case 'match_result'://赛事结果
-//                                throw new \Exception(Response::generate('赛事结果数据-match_result:',Response::AUTH_ERROR));
-//                                $this->match_result($vv);
-//                                break;
-//                            case 'match_result_record'://赛事结果记录
-//                                $this->com_result_record($vv);
-//                                break;
-//                            case 'odds_record'://赔率记录
-//                                throw new \Exception(Response::generate('赔率记录数据-odds_record:',Response::AUTH_ERROR));
-//                                $this->odds_record($vv);
-//                                break;
-//                            case 'broadcast'://直播数据
-//                                $this->broadcast($vv);
-//                                break;
-//                            default:
-//                                throw new \Exception(Response::generate('',Response::ABNORMAL)) ;
-//                        }
-//                    }
-//                }
             }
             //提交事务
             DB::commit();
@@ -375,22 +332,22 @@ class WriteSportsController extends BaseController{
         $set_odds_r = [
             'match_id'=> $match_id,
             'others_match_id'=> $others_match_id,
-            'odds_code'=> $data['odds_code'],
-            'status'=> $data['status'],
-            'sort'=> $data['sort'],
-            'p_code'=> $data['p_code'],
-            'odds'=> $data['odds'],
-            'condition'=> $data['condition'],
-            'odds_only'=> $data['odds_only'],
-            'source'=> $data['source'],
-            'type'=> $data['type'],
+            'odds_code'=> $data['odds_code']?:'',
+            'status'=> $data['status']?:0,
+            'sort'=> $data['sort']?:0,
+            'p_code'=> $data['p_code']?:'',
+            'odds'=> $data['odds']?:0,
+            'condition'=> $data['condition']?:'',
+            'odds_only'=> $data['odds_only']?:'',
+            'source'=> $data['source']?:'',
+            'type'=> $data['type']?:0,
             'team'=> $data['team']?:'',
             'lg_id'=> $lg_id,
             'others_lg_id'=> $others_lg_id,
             'ctime'=> date('Y-m-d H:m:i'),
         ];
         //更新或写入赔率记录
-        if(!empty($oddsID)){
+        if(!empty($oddsRecordID)){
             $ret = $model['model_odds_record']::where(['id'=>$oddsRecordID])
                 -> update($set_odds_r);
             if($ret < 1) throw new \Exception(Response::generate(gameModel::getGameName($game_code).'赔率记录-odds_only:'.$data['odds_only'].';',Response::ADD_ODDS_R_ERROR)) ;//Render([], '10020', lang('Tips','Sports')->get('add_odds_r_error'));
@@ -398,6 +355,7 @@ class WriteSportsController extends BaseController{
             $ret = $model['model_odds_record']::insert($set_odds_r);
             if($ret != true) throw new \Exception(Response::generate(gameModel::getGameName($game_code).'赔率记录-odds_only:'.$data['odds_only'].';',Response::ADD_ODDS_R_ERROR));//Render([], '10020', lang('Tips','Sports')->get('add_odds_r_error'));
         }
+
         //===写赔率===
         //查询 赔率数据是否存在
         $oddsID = $model['model_odds']::where(['sole'=>$data['sole']])
@@ -406,17 +364,17 @@ class WriteSportsController extends BaseController{
         $set_odds = [
             'match_id'=> $match_id,
             'others_match_id'=> $others_match_id,
-            'odds_code'=> $data['odds_code'],
-            'status'=> $data['status'],
-            'sort'=> $data['sort'],
-            'p_code'=> $data['p_code'],
-            'odds'=> $data['odds'],
-            'condition'=> $data['condition'],
-            'odds_only'=> $data['odds_only'],
-            'sole'=> $data['sole'],
-            'source'=> $data['source'],
-            'type'=> $data['type'],
-            'team'=> $data['team'],
+            'odds_code'=> $data['odds_code']?:'',
+            'status'=> $data['status']?:0,
+            'sort'=> $data['sort']?:0,
+            'p_code'=> $data['p_code']?:'',
+            'odds'=> $data['odds']?:0,
+            'condition'=> $data['condition']?:'',
+            'odds_only'=> $data['odds_only']?:'',
+            'sole'=> $data['sole']?:'',
+            'source'=> $data['source']?:'',
+            'type'=> $data['type']?:0,
+            'team'=> $data['team']?:'',
             'lg_id'=> $lg_id,
             'others_lg_id'=> $others_lg_id,
             'ctime'=> date('Y-m-d H:m:i'),

app/Http/Model/StLqResult.php

@@ -23,12 +23,11 @@ class StLqResult extends Model
 
         //没有数据，无需操作
         if(empty($matchData)) return Response::success();
-        //获取赛事结果表 所有当月
+        //获取赛事结果表 15天内
         $matchData_r = $model['model_result']::select('match_id')
             ->where([['status','>',0],['update_time','>',date('Y-m-d', strtotime("-15 day"))]])
             ->get()
             ->toarray();
-
         //结果表无数据，直接插入
         if(empty($matchData_r)){
             foreach ($matchData as $k=>$v){
@@ -41,6 +40,7 @@ class StLqResult extends Model
                     "lg_id"=>$v['lg_id'],
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
+//                    "match_process"=>$process,
                     'match_time'=>$match_time,
                     "update_time"=>date('Y-m-d H:m:i')
                 ];
@@ -61,6 +61,14 @@ class StLqResult extends Model
         if(!empty($matchData)){
             //写入结果表不存在赛事
             foreach ($matchData as $k=>$v){
+                $process = 0;
+                if((int)$v['status'] == 2){
+                    $process = 4;
+                }
+                if((int)$v['status'] == 1){
+                    $process = 4;
+                }
+
                 $time = time()-strtotime($v['match_time']);
                 $match_time = self::secTime($time);
                 $set_match_r[] = [
@@ -70,6 +78,7 @@ class StLqResult extends Model
                     "lg_id"=>$v['lg_id'],
                     "status"=>$v['status'],
                     "tag"=> $v['tag'],
+//                    "match_process"=>$process,
                     'match_time'=>$match_time,
                     "update_time"=>date('Y-m-d H:m:i')
                 ];

app/Models/MoneyBuyMatch.php

@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Model;
 class MoneyBuyMatch extends Model
 {
     protected $table='money_buy_match';
+    public $timestamps = false;
 
     public function getByAttrs($where,$orderArray=[]){
         if (empty($order)){