追加推送 5/24

app/Http/Controllers/Admin/SportsBaseController.php

@@ -21,6 +21,14 @@ class SportsBaseController extends Controller {
         $request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BaseLeague::join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')->select('st_bq_league.id','st_bq_league.name_chinese')->where('st_bq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
+//        }
+
         $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
         $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
@@ -30,14 +38,11 @@ class SportsBaseController extends Controller {
         $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
-//        $dt->addColsFields('home_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 130));
-//        $dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 130));
         $dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('recommend', array('templet' => '#recommend', 'sort' => false, 'width' => 120,'align' => 'center'));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('result', array( 'sort' => false, 'width' => 100));
-        //$arr[] = 'view';
         if (checkRriv('/admin/SportsBase/edit')) {
             $arr[] = 'edit';
         }
@@ -76,7 +81,6 @@ class SportsBaseController extends Controller {
             }
         }
         if (!empty($match_date)) {
-//            $where[] = array('st_bq_competition.match_date', '=', '2019-04-13');
             $where[] = array('st_bq_competition.match_date', '=', $match_date);
         }
         if ($status != -1) {
@@ -106,6 +110,14 @@ class SportsBaseController extends Controller {
      *获取所有足球联赛信息
      */
     function getParent() {
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BaseLeague::join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')->select('st_bq_league.id','st_bq_league.name_chinese')->where('st_bq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
+//        }
+
         $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
         if (!$data) {
             return;
@@ -298,7 +310,10 @@ class SportsBaseController extends Controller {
             $match_id = $newapp->match_id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
-        $data = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
+
+        $data = \App\Models\Matchcode::where('p_id','0')->get();
+
+        //$data = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
         $request['pcode'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsBase/oddsinfo?match_id='.$match_id.'');
@@ -368,7 +383,10 @@ class SportsBaseController extends Controller {
      *添加赔率
      */
     function addodds(Req $req) {
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
+
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
+
+        //$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -440,7 +458,10 @@ class SportsBaseController extends Controller {
      *修改赔率
      */
     function oddsedit(Req $req) {
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
+
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
+
+        //$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -454,8 +475,13 @@ class SportsBaseController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','bq')->first();
-            $data->odds_name = $res->odds_name;
+
+            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->first();
+
+            //$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','bq')->first();
+            if(!empty($res)){
+                $data->odds_name = $res->odds_name;
+            }
 
             $expire_time = $data->expire_time; //2019-04-15 21:10:00
             $str1 = str_replace(" ","T",$expire_time);

app/Http/Controllers/Admin/SportsBasketController.php

@@ -21,6 +21,14 @@ class SportsBasketController extends Controller {
 		$request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BasketLeague::join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')->select('st_lq_league.id','st_lq_league.name_chinese')->where('st_lq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BasketLeague::select('id','name_chinese')->get();
+//        }
+
 		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
 		$request['league'] = $data;
 		$dt = \App\Lib\DataTable\DataTable::init();
@@ -104,6 +112,14 @@ class SportsBasketController extends Controller {
 	 *获取所有篮球联赛信息
 	 */
 	function getParent() {
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\BasketLeague::join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')->select('st_lq_league.id','st_lq_league.name_chinese')->where('st_lq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\BasketLeague::select('id','name_chinese')->get();
+//        }
+
 		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
 		if (!$data) {
 			return;
@@ -296,7 +312,8 @@ class SportsBasketController extends Controller {
 			$match_id = $newapp->match_id;
 		}
 		$request['match_id'] = isset($match_id) ? trim($match_id) : null;
-		$data = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
+		$data = \App\Models\Matchcode::where('p_id','0')->get();
+		//$data = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
 		$request['pcode'] = $data;
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/SportsBasket/oddsinfo?match_id='.$match_id.'');
@@ -366,7 +383,8 @@ class SportsBasketController extends Controller {
 	 *添加赔率
 	 */
 	function addodds(Req $req) {
-		$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
+		$pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
+		//$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
 		for($i=0;$i<count($pcodedata);$i++){
 			$pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
 		}
@@ -438,7 +456,8 @@ class SportsBasketController extends Controller {
 	 *修改赔率
 	 */
 	function oddsedit(Req $req) {
-		$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
+		$pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
+		//$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
 		for($i=0;$i<count($pcodedata);$i++){
 			$pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
 		}
@@ -452,8 +471,11 @@ class SportsBasketController extends Controller {
 			if (!$data) {
 				return -2;
 			}
-			$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','lq')->first();
-			$data->odds_name = $res->odds_name;
+			//$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','lq')->first();
+			$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->first();
+			if(!empty($res)){
+				$data->odds_name = $res->odds_name;
+			}
 
 			$expire_time = $data->expire_time; //2019-04-15 21:10:00
 			$str1 = str_replace(" ","T",$expire_time);

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -169,7 +169,6 @@ class SportsSoccerController extends Controller {
             return view('sports.soccer_form', $data);
         } else {
             $model = new \App\Models\SportsSoccer();
-            // $model->id = $req->input('parent_id');
             $model->home_team = $req->input('home_team');
             $model->guest_team = $req->input('guest_team');
             $model->lg_id = $req->input('parent_id');

app/Http/Controllers/Admin/SportsTennisController.php

@@ -21,6 +21,14 @@ class SportsTennisController extends Controller {
         $request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\TennisLeague::join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')->select('st_wq_league.id','st_wq_league.name_chinese')->where('st_wq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\TennisLeague::select('id','name_chinese')->get();
+//        }
+
         $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
         $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
@@ -30,8 +38,6 @@ class SportsTennisController extends Controller {
         $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
-//        $dt->addColsFields('home_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 130));
-//        $dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 130));
         $dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('recommend', array('templet' => '#recommend', 'sort' => false, 'width' => 120,'align' => 'center'));
@@ -76,7 +82,6 @@ class SportsTennisController extends Controller {
             }
         }
         if (!empty($match_date)) {
-//            $where[] = array('st_wq_competition.match_date', '=', '2019-04-13');
             $where[] = array('st_wq_competition.match_date', '=', $match_date);
         }
         if ($status != -1) {
@@ -106,6 +111,14 @@ class SportsTennisController extends Controller {
      *获取所有足球联赛信息
      */
     function getParent() {
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $data = \App\Models\TennisLeague::join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')->select('st_wq_league.id','st_wq_league.name_chinese')->where('st_wq_local_league.source',$source->infocontent)->get();
+//        }else{
+//            $data = \App\Models\TennisLeague::select('id','name_chinese')->get();
+//        }
+
         $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
         if (!$data) {
             return;
@@ -298,7 +311,10 @@ class SportsTennisController extends Controller {
             $match_id = $newapp->match_id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
-        $data = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
+
+        $data = \App\Models\Matchcode::where('p_id','0')->get();
+
+        //$data = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
         $request['pcode'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsTennis/oddsinfo?match_id='.$match_id.'');
@@ -368,7 +384,10 @@ class SportsTennisController extends Controller {
      *添加赔率
      */
     function addodds(Req $req) {
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
+
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
+
+        //$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -440,7 +459,10 @@ class SportsTennisController extends Controller {
      *修改赔率
      */
     function oddsedit(Req $req) {
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
+
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
+
+        //$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -454,8 +476,12 @@ class SportsTennisController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','wq')->first();
-            $data->odds_name = $res->odds_name;
+            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->first();
+
+            //$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','wq')->first();
+            if(!empty($res)){
+                $data->odds_name = $res->odds_name;
+            }
 
             $expire_time = $data->expire_time; //2019-04-15 21:10:00
             $str1 = str_replace(" ","T",$expire_time);

app/Models/BaseOdds.php

@@ -24,6 +24,10 @@ class BaseOdds extends BaseModel
             return -2021052003;
         }
 
+        //玩法代码
+        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
+        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){
                 $data[$i]['status'] = '启用';
@@ -32,18 +36,26 @@ class BaseOdds extends BaseModel
             }else if($data[$i]['status']==-1){
                 $data[$i]['status'] = '禁用';
             }
-            $odds_name = \App\Models\Matchcode::where('odds_code',$data[$i]['odds_code'])->first();
-            if(!empty($odds_name)){
-                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
-            }else{
-                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+
+            $data[$i]['p_code_cn'] = '';
+            $data[$i]['odds_code_cn'] = '';
+            for($j=0;$j<count($pcode);$j++){
+                if($data[$i]['p_code'] == $pcode[$j]->odds_code){
+                    $data[$i]['p_code_cn'] = $pcode[$j]->odds_name;
+                }
             }
-            $p_name = \App\Models\Matchcode::where('odds_code',$data[$i]['p_code'])->first();
-            if(!empty($p_name)){
-                $data[$i]['p_code_cn'] = $p_name->odds_name;
-            }else{
+            if($data[$i]['p_code_cn'] == ''){
                 $data[$i]['p_code_cn'] = $data[$i]['p_code'];
             }
+
+            for($a=0;$a<count($odds_code);$a++){
+                if($data[$i]['odds_code'] == $odds_code[$a]->odds_code){
+                    $data[$i]['odds_code_cn'] = $odds_code[$a]->odds_name;
+                }
+            }
+            if($data[$i]['odds_code_cn'] == ''){
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
         }
         return $data;
 

app/Models/BasketOdds.php

@@ -24,6 +24,10 @@ class BasketOdds extends BaseModel
             return -2021052003;
         }
 
+        //玩法代码
+        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
+        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){
                 $data[$i]['status'] = '启用';
@@ -32,18 +36,26 @@ class BasketOdds extends BaseModel
             }else if($data[$i]['status']==-1){
                 $data[$i]['status'] = '禁用';
             }
-            $odds_name = \App\Models\Matchcode::where('odds_code',$data[$i]['odds_code'])->first();
-            if(!empty($odds_name)){
-                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
-            }else{
-                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+
+            $data[$i]['p_code_cn'] = '';
+            $data[$i]['odds_code_cn'] = '';
+            for($j=0;$j<count($pcode);$j++){
+                if($data[$i]['p_code'] == $pcode[$j]->odds_code){
+                    $data[$i]['p_code_cn'] = $pcode[$j]->odds_name;
+                }
             }
-            $p_name = \App\Models\Matchcode::where('odds_code',$data[$i]['p_code'])->first();
-            if(!empty($p_name)){
-                $data[$i]['p_code_cn'] = $p_name->odds_name;
-            }else{
+            if($data[$i]['p_code_cn'] == ''){
                 $data[$i]['p_code_cn'] = $data[$i]['p_code'];
             }
+
+            for($a=0;$a<count($odds_code);$a++){
+                if($data[$i]['odds_code'] == $odds_code[$a]->odds_code){
+                    $data[$i]['odds_code_cn'] = $odds_code[$a]->odds_name;
+                }
+            }
+            if($data[$i]['odds_code_cn'] == ''){
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
         }
         return $data;
 

app/Models/MoneyBuyStr.php

@@ -73,6 +73,7 @@ class MoneyBuyStr extends BaseModel {
             
             //用户投注前账户金额
             $data[$i]->available_cash = $data[$i]->money_cash+$data[$i]->money;
+
             $data[$i]->account = $data[$i]->available_cash.' <span>'.$data[$i]->account_name.' </span> '.$data[$i]->frozen_cash;
 
             if($data[$i]->settle_status == '未结算'){

app/Models/SoccerOdds.php

@@ -24,6 +24,10 @@ class SoccerOdds extends BaseModel
             return -2021052003;
         }
 
+        //玩法代码
+        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
+        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){
                 $data[$i]['status'] = '启用';
@@ -32,18 +36,26 @@ class SoccerOdds extends BaseModel
             }else if($data[$i]['status']==-1){
                 $data[$i]['status'] = '禁用';
             }
-            $odds_name = \App\Models\Matchcode::where('odds_code',$data[$i]['odds_code'])->first();
-            if(!empty($odds_name)){
-                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
-            }else{
-                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+
+            $data[$i]['p_code_cn'] = '';
+            $data[$i]['odds_code_cn'] = '';
+            for($j=0;$j<count($pcode);$j++){
+                if($data[$i]['p_code'] == $pcode[$j]->odds_code){
+                    $data[$i]['p_code_cn'] = $pcode[$j]->odds_name;
+                }
             }
-            $p_name = \App\Models\Matchcode::where('odds_code',$data[$i]['p_code'])->first();
-            if(!empty($p_name)){
-                $data[$i]['p_code_cn'] = $p_name->odds_name;
-            }else{
+            if($data[$i]['p_code_cn'] == ''){
                 $data[$i]['p_code_cn'] = $data[$i]['p_code'];
             }
+
+            for($a=0;$a<count($odds_code);$a++){
+                if($data[$i]['odds_code'] == $odds_code[$a]->odds_code){
+                    $data[$i]['odds_code_cn'] = $odds_code[$a]->odds_name;
+                }
+            }
+            if($data[$i]['odds_code_cn'] == ''){
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
         }
         return $data;
 

app/Models/SportsBase.php

@@ -13,9 +13,38 @@ class SportsBase extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
+
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $where[] = array('st_bq_local_match.source', '=', $source->infocontent);
+//            $where[] = array('st_bq_local_league.source', '=', $source->infocontent);
+//        }
+//
+//        if (is_array ($where) && count ($where) > 0) {
+//            $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.id')
+//                ->join('st_bq_local_match','st_bq_competition.id','=','st_bq_local_match.match_id')
+//                ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
+//                ->select('st_bq_competition.id','st_bq_local_match.match_id','st_bq_local_league.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
+//                ->orderby('st_bq_competition.match_date','desc')
+//                ->orderby('st_bq_competition.match_time','desc')
+//                ->where($where)
+//                ->orwhere($orwhere)
+//                ->paginate ($list);
+//        } else {
+//            $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.id')
+//                ->join('st_bq_local_match','st_bq_competition.id','=','st_bq_local_match.match_id')
+//                ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
+//                ->select('st_bq_competition.id','st_bq_local_match.match_id','st_bq_local_league.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
+//                ->orderby('st_bq_competition.match_date','desc')
+//                ->orderby('st_bq_competition.match_time','desc')
+//                ->paginate ($list);
+//        }
+
+
+
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.lg_id')
-                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
+                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
                 ->orderby('st_bq_competition.match_date','desc')
                 ->orderby('st_bq_competition.match_time','desc')
                 ->where($where)
@@ -23,7 +52,7 @@ class SportsBase extends BaseModel {
                 ->paginate ($list);
         } else {
             $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.lg_id')
-                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
+                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
                 ->orderby('st_bq_competition.match_date','desc')
                 ->orderby('st_bq_competition.match_time','desc')
                 ->paginate ($list);
@@ -31,24 +60,16 @@ class SportsBase extends BaseModel {
         if (!$data < 0) {
             return -2021052003; //
         }
+
+        //赛事结果处理状态查询
+        $result = \App\Models\Comendnotice::where('game_code','bq')->get();
+
         for($i=0;$i<count($data);$i++){
-            if($data[$i]->match_date < date('Y-m-d',time())){
-                $data[$i]->status = '2';
-                //$this->where('id', $data[$i]->id)->update(['status' => 2]);
-            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time)+5400 <= strtotime(date('H:i:s',time()))){
-                $data[$i]->status = '2';
-                //$this->where('id', $data[$i]->id)->update(['status' => 2]);
-            }
-            else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) < strtotime(date('H:i:s',time())) && strtotime(date('H:i:s',time())) < strtotime($data[$i]->match_time)+5400){
-                $data[$i]->status = '1';
-                //$this->where('id', $data[$i]->id)->update(['status' => 1]);
-            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) > strtotime(date('H:i:s',time()))){
-                $data[$i]->status = '0';
-                //$this->where('id', $data[$i]->id)->update(['status' => 0]);
-            }
-            else if($data[$i]->match_date > date('Y-m-d',time())){
-                $data[$i]->status = '0';
-                //$this->where('id', $data[$i]->id)->update(['status' => 0]);
+
+            if($data[$i]->match_date == '' && $data[$i]->last_time != ''){
+                $datetime = explode(' ',$data[$i]->last_time);
+                $data[$i]->match_date = $datetime[0];
+                $data[$i]->match_time = $datetime[1];
             }
 
             if($data[$i]->status==0){
@@ -63,9 +84,21 @@ class SportsBase extends BaseModel {
             }else{
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
-            $result = \App\Models\Comendnotice::where('match_id',$data[$i]->match_id)->where('game_code','bq')->first();
+
+            //赛事结果状态
             if(!empty($result)){
-                if($result->status == '0'){
+                for($j=0;$j<count($result);$j++){
+                    if($data[$i]->match_id == $result[$j]->match_id){
+                        $data[$i]->result_status = $result[$j]->status;
+                    }else{
+                        $data[$i]->result_status = null;
+                    }
+                }
+            }else{
+                $data[$i]->result_status = null;
+            }
+            if($data[$i]->result_status != null){
+                if($data[$i]->result_status == '0'){
                     $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsBase/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsBase/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
                 }else{
                     $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';

app/Models/SportsBasket.php

@@ -98,7 +98,7 @@ class SportsBasket extends BaseModel {
             }
             if($data[$i]->result_status != null){
                 if($data[$i]->result_status == '0'){
-                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsSoccer/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsSoccer/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsBasket/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsBasket/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
                 }else{
                     $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
                 }

app/Models/SportsNoteList.php

@@ -25,6 +25,9 @@ class SportsNoteList extends BaseModel {
             return -2021052003; //
         }
 
+        //反水
+        $water_return_money = \App\Models\Money_details::where('trade_type','7')->get();
+
         for($i=0;$i<count($data);$i++){
             if($data[$i]->settle_status==1){
                 $data[$i]->settle_status = '未结算';
@@ -43,20 +46,35 @@ class SportsNoteList extends BaseModel {
             $data[$i]->match_id_order = '<span>'.$data[$i]->match_id.'</span><br>'.$data[$i]->order_id;
             $data[$i]->league = $data[$i]->name_chinese;
 
+            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            $data[$i]->match_time = '开赛：'.$data[$i]->match_date.' '.$data[$i]->match_time;
+            $data[$i]->money_match_time = '投注：'.$data[$i]->money_time.'<br>'.$data[$i]->match_time;
+
             //反水
             $data[$i]->water_return = '0';
+//            for($a=0;$a<count($water_return_money);$a++){
+//                if($data[$i]->order_id == $water_return_money[$a]->trade_id){
+//                    $data[$i]->water_return = $water_return_money[$a]->money;
+//                    //用户投注后账户金额
+//                    $data[$i]->frozen_cash = $water_return_money[$a]->money_cash;
+//                }
+//            }
+//            if($data[$i]->water_return == '0'){
+//                $data[$i]->frozen_cash = $data[$i]->money_cash;
+//            }
+
             $water_return_money = \App\Models\Money_details::where('trade_id',$data[$i]->order_id)->where('trade_type','7')->first();
             if(!empty($water_return_money)){
                 $data[$i]->water_return = $water_return_money->money;
+                //用户投注后账户金额
+                $data[$i]->frozen_cash = $water_return_money->money_cash;
+            }else{
+                //用户投注后账户金额
+                $data[$i]->frozen_cash = $data[$i]->money_cash;
             }
             $data[$i]->result = $data[$i]->water_return+$data[$i]->gain_money;
 
-            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
-            $data[$i]->match_time = '开赛：'.$data[$i]->match_date.' '.$data[$i]->match_time;
-            $data[$i]->money_match_time = '投注：'.$data[$i]->money_time.'<br>'.$data[$i]->match_time;
 
-            //用户投注后账户金额
-            $data[$i]->frozen_cash = $water_return_money->money_cash;
             //用户投注前账户金额
             $data[$i]->available_cash = $data[$i]->money_cash;
 

app/Models/SportsSoccer.php

@@ -85,27 +85,38 @@ class SportsSoccer extends BaseModel {
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
 
-            //赛事结果状态
+            $result = \App\Models\Comendnotice::where('game_code','zq')->where('match_id',$data[$i]->match_id)->first();
             if(!empty($result)){
-                for($j=0;$j<count($result);$j++){
-                    if($data[$i]->match_id == $result[$j]->match_id){
-                        $data[$i]->result_status = $result[$j]->status;
-                    }else{
-                        $data[$i]->result_status = null;
-                    }
-                }
-            }else{
-                $data[$i]->result_status = null;
-            }
-            if($data[$i]->result_status != null){
-                if($data[$i]->result_status == '0'){
+                if($result->status == '0'){
                     $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsSoccer/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsSoccer/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
                 }else{
-                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: #FFAF60;"> 已处理 </a>';
                 }
             }else{
                 $data[$i]->result = '<a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 处理 </a>';
             }
+
+            //赛事结果状态
+//            if(!empty($result)){
+//                for($j=0;$j<count($result);$j++){
+//                    if($data[$i]->match_id == $result[$j]->match_id){
+//                        $data[$i]->result_status = $result[$j]->status;
+//                    }else{
+//                        $data[$i]->result_status = null;
+//                    }
+//                }
+//            }else{
+//                $data[$i]->result_status = null;
+//            }
+//            if($data[$i]->result_status != null){
+//                if($data[$i]->result_status == '0'){
+//                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsSoccer/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsSoccer/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
+//                }else{
+//                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
+//                }
+//            }else{
+//                $data[$i]->result = '<a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 处理 </a>';
+//            }
         }
         return $data->toArray();
     }

app/Models/SportsTennis.php

@@ -13,9 +13,37 @@ class SportsTennis extends BaseModel {
 
     function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
+//        $source = \App\Models\Setinfo::where('id','1000')->first();
+//        if($source->infocontent != '混合数据'){
+//            $where[] = array('st_wq_local_match.source', '=', $source->infocontent);
+//            $where[] = array('st_wq_local_league.source', '=', $source->infocontent);
+//        }
+//
+//        if (is_array ($where) && count ($where) > 0) {
+//            $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.id')
+//                ->join('st_wq_local_match','st_wq_competition.id','=','st_wq_local_match.match_id')
+//                ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
+//                ->select('st_wq_competition.id','st_wq_local_match.match_id','st_wq_local_league.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
+//                ->orderby('st_wq_competition.match_date','desc')
+//                ->orderby('st_wq_competition.match_time','desc')
+//                ->where($where)
+//                ->orwhere($orwhere)
+//                ->paginate ($list);
+//        } else {
+//            $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.id')
+//                ->join('st_wq_local_match','st_wq_competition.id','=','st_wq_local_match.match_id')
+//                ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
+//                ->select('st_wq_competition.id','st_wq_local_match.match_id','st_wq_local_league.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
+//                ->orderby('st_wq_competition.match_date','desc')
+//                ->orderby('st_wq_competition.match_time','desc')
+//                ->paginate ($list);
+//        }
+
+
+
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.lg_id')
-                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
+                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
                 ->where($where)
@@ -23,7 +51,7 @@ class SportsTennis extends BaseModel {
                 ->paginate ($list);
         } else {
             $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.lg_id')
-                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
+                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
                 ->paginate ($list);
@@ -31,24 +59,16 @@ class SportsTennis extends BaseModel {
         if (!$data < 0) {
             return -2021052003; //
         }
+
+        //赛事结果处理状态查询
+        $result = \App\Models\Comendnotice::where('game_code','wq')->get();
+
         for($i=0;$i<count($data);$i++){
-            if($data[$i]->match_date < date('Y-m-d',time())){
-                $data[$i]->status = '2';
-                //$this->where('id', $data[$i]->id)->update(['status' => 2]);
-            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time)+5400 <= strtotime(date('H:i:s',time()))){
-                $data[$i]->status = '2';
-                //$this->where('id', $data[$i]->id)->update(['status' => 2]);
-            }
-            else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) < strtotime(date('H:i:s',time())) && strtotime(date('H:i:s',time())) < strtotime($data[$i]->match_time)+5400){
-                $data[$i]->status = '1';
-                //$this->where('id', $data[$i]->id)->update(['status' => 1]);
-            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) > strtotime(date('H:i:s',time()))){
-                $data[$i]->status = '0';
-               //$this->where('id', $data[$i]->id)->update(['status' => 0]);
-            }
-            else if($data[$i]->match_date > date('Y-m-d',time())){
-                $data[$i]->status = '0';
-                //$this->where('id', $data[$i]->id)->update(['status' => 0]);
+
+            if($data[$i]->match_date == '' && $data[$i]->last_time != ''){
+                $datetime = explode(' ',$data[$i]->last_time);
+                $data[$i]->match_date = $datetime[0];
+                $data[$i]->match_time = $datetime[1];
             }
 
             if($data[$i]->status==0){
@@ -63,9 +83,21 @@ class SportsTennis extends BaseModel {
             }else{
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
-            $result = \App\Models\Comendnotice::where('match_id',$data[$i]->match_id)->where('game_code','wq')->first();
+
+            //赛事结果状态
             if(!empty($result)){
-                if($result->status == '0'){
+                for($j=0;$j<count($result);$j++){
+                    if($data[$i]->match_id == $result[$j]->match_id){
+                        $data[$i]->result_status = $result[$j]->status;
+                    }else{
+                        $data[$i]->result_status = null;
+                    }
+                }
+            }else{
+                $data[$i]->result_status = null;
+            }
+            if($data[$i]->result_status != null){
+                if($data[$i]->result_status == '0'){
                     $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsTennis/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsTennis/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
                 }else{
                     $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';

app/Models/TennisOdds.php

@@ -24,6 +24,10 @@ class TennisOdds extends BaseModel
             return -2021052003;
         }
 
+        //玩法代码
+        $pcode = \App\Models\Matchcode::where('p_id','0')->get();
+        $odds_code = \App\Models\Matchcode::where('p_id','!=','0')->get();
+
         for($i=0;$i<count($data);$i++){
             if($data[$i]['status']==0){
                 $data[$i]['status'] = '启用';
@@ -32,18 +36,26 @@ class TennisOdds extends BaseModel
             }else if($data[$i]['status']==-1){
                 $data[$i]['status'] = '禁用';
             }
-            $odds_name = \App\Models\Matchcode::where('odds_code',$data[$i]['odds_code'])->first();
-            if(!empty($odds_name)){
-                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
-            }else{
-                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+
+            $data[$i]['p_code_cn'] = '';
+            $data[$i]['odds_code_cn'] = '';
+            for($j=0;$j<count($pcode);$j++){
+                if($data[$i]['p_code'] == $pcode[$j]->odds_code){
+                    $data[$i]['p_code_cn'] = $pcode[$j]->odds_name;
+                }
             }
-            $p_name = \App\Models\Matchcode::where('odds_code',$data[$i]['p_code'])->first();
-            if(!empty($p_name)){
-                $data[$i]['p_code_cn'] = $p_name->odds_name;
-            }else{
+            if($data[$i]['p_code_cn'] == ''){
                 $data[$i]['p_code_cn'] = $data[$i]['p_code'];
             }
+
+            for($a=0;$a<count($odds_code);$a++){
+                if($data[$i]['odds_code'] == $odds_code[$a]->odds_code){
+                    $data[$i]['odds_code_cn'] = $odds_code[$a]->odds_name;
+                }
+            }
+            if($data[$i]['odds_code_cn'] == ''){
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
         }
         return $data;