追加推送 6/11

app/Http/Controllers/Admin/BaseLeagueController.php

@@ -19,7 +19,7 @@ class BaseLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
+        $request['id'] = isset($req->id) ? trim($req->id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class BaseLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BaseLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));
@@ -48,7 +48,6 @@ class BaseLeagueController extends Controller {
     function info(Req $req) {
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
-        $lg_id = Request::has('lg_id') ? Request::get('lg_id') : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
         $area_id = Request::has('area_id') ? Request::get('area_id') : '';
         $country_id = Request::has('country_id') ? Request::get('country_id') : '';

app/Http/Controllers/Admin/BasketLeagueController.php

@@ -19,7 +19,7 @@ class BasketLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
+        $request['id'] = isset($req->id) ? trim($req->id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class BasketLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BasketLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));

app/Http/Controllers/Admin/SoccerLeagueController.php

@@ -19,7 +19,7 @@ class SoccerLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
+        $request['id'] = isset($req->id) ? trim($req->id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class SoccerLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));

app/Http/Controllers/Admin/SportsfootController.php

@@ -61,11 +61,15 @@ class SportsfootController extends Controller {
 		$simplex_ids = array_column($newapp->allsimplexorder($ssid),'order_id');
 		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
 
-		$SettlementOrder = new SettlementOrder();
-        $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid);//串式
-        $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
-
-        return responseToJson($data);
+		$update = $this->addcomendnotice($ssid);
+		if($update['status']==1){
+			$SettlementOrder = new SettlementOrder();
+	        $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid);//串式
+	        $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
+	        return responseToJson($data);
+	    }else{
+	    	return responseToJson($update);
+	    }
 	}
 
 	//作废

app/Http/Controllers/Admin/TennisLeagueController.php

@@ -19,7 +19,7 @@ class TennisLeagueController extends Controller {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['area_id'] = isset($req->area_id) ? trim($req->area_id) : '';
         $request['country_id'] = isset($req->country_id) ? trim($req->country_id) : '';
-        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : '';
+        $request['id'] = isset($req->id) ? trim($req->id) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '0';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
         $data = \App\Models\SoccerLeague::select('id','lg_id','name_chinese')->get();
@@ -31,7 +31,7 @@ class TennisLeagueController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/TennisLeague/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 120));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('area', array('sort' => false, 'width' => 180));
         $dt->addColsFields('country', array('sort' => true, 'width' => 180));
@@ -48,7 +48,7 @@ class TennisLeagueController extends Controller {
     function info(Req $req) {
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
-        $lg_id = Request::has('lg_id') ? Request::get('lg_id') : '';
+        $id = Request::has('id') ? Request::get('id') : '';
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
         $area_id = Request::has('area_id') ? Request::get('area_id') : '';
         $country_id = Request::has('country_id') ? Request::get('country_id') : '';

app/Lib/Settlement/Adapter/RulePlus.php

@@ -68,26 +68,26 @@ trait RulePlus
     //$condition 0.5/1  2/2.5   2   这样的
 
     /**
-    条件  大/小 进球数                   输赢
-    1/1.5 大    0  $min=-1.5,$max=-1     -1
-    1/1.5 大    1  $min=-0.5,$max=0       4
-    1/1.5 大    2  $min=0.5,$max=1        1
-    1/1.5 大    3  $min=1.5,$max=2        1
-
-    1.5/2 大    0  $min=-2,$max=-1.5     -1
-    1.5/2 大    1  $min=-1,$max=-0.5     -1
-    1.5/2 大    2  $min=0,$max=0.5   	  3
-    1.5/2 大    3  $min=1,$max=1.5   	  1
-    --------------------------------------------------
-    1/1.5 小    0  $min=-1.5,$max=-1  	  1
-    1/1.5 小    1  $min=-0.5,$max=0  	  3
-    1/1.5 小    2  $min=0.5,$max=1  	 -1
-    1/1.5 小    3  $min=1.5,$max=2       -1
-
-    1.5/2 小    0  $min=-2,$max=-1.5  	  1
-    1.5/2 小    1  $min=-1,$max=-0.5 	  1
-    1.5/2 小    2  $min=0,$max=0.5  	  4
-    1.5/2 小    3  $min=1,$max=1.5 		 -1
+     * 条件  大/小 进球数                   输赢
+     * 1/1.5 大    0  $min=-1.5,$max=-1     -1
+     * 1/1.5 大    1  $min=-0.5,$max=0       4
+     * 1/1.5 大    2  $min=0.5,$max=1        1
+     * 1/1.5 大    3  $min=1.5,$max=2        1
+     *
+     * 1.5/2 大    0  $min=-2,$max=-1.5     -1
+     * 1.5/2 大    1  $min=-1,$max=-0.5     -1
+     * 1.5/2 大    2  $min=0,$max=0.5      3
+     * 1.5/2 大    3  $min=1,$max=1.5      1
+     * --------------------------------------------------
+     * 1/1.5 小    0  $min=-1.5,$max=-1      1
+     * 1/1.5 小    1  $min=-0.5,$max=0      3
+     * 1/1.5 小    2  $min=0.5,$max=1     -1
+     * 1/1.5 小    3  $min=1.5,$max=2       -1
+     *
+     * 1.5/2 小    0  $min=-2,$max=-1.5      1
+     * 1.5/2 小    1  $min=-1,$max=-0.5      1
+     * 1.5/2 小    2  $min=0,$max=0.5      4
+     * 1.5/2 小    3  $min=1,$max=1.5         -1
      */
     public function zq_inball_bigsmall($score, $condition, $type, $matchResultWord)
     {

app/Models/SportsSoccer.php

@@ -49,49 +49,49 @@ class SportsSoccer extends BaseModel {
         
         $where[] = array('st_zq_league.name_chinese','<>','');
 
-//        $source = \App\Model\Setinfo::where('id','1000')->first();
-//        if($source->infocontent != '混合数据'){
-//            $where[] = array('st_zq_local_match.source', '=', $source->infocontent);
-//            $where[] = array('st_zq_local_league.source', '=', $source->infocontent);
-//        }
-//        if (is_array ($where) && count ($where) > 0) {
-//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
-//                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
-//                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
-//                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
-//                ->orderby('st_zq_competition.match_date','desc')
-//                ->orderby('st_zq_competition.match_time','desc')
-//                ->where($where)
-//                ->orwhere($orwhere)
-//                ->paginate ($list);
-//        } else {
-//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
-//                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
-//                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
-//                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
-//                ->orderby('st_zq_competition.match_date','desc')
-//                ->orderby('st_zq_competition.match_time','desc')
-//                ->paginate ($list);
-//        }
-
-
-
+        $source = \App\Models\Setinfo::where('id','1000')->first();
+        if($source->infocontent != '混合数据'){
+            $where[] = array('st_zq_local_match.source', '=', $source->infocontent);
+            $where[] = array('st_zq_local_league.source', '=', $source->infocontent);
+        }
         if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
-                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
+                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
+                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
+                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
                 ->orderby('st_zq_competition.match_date','desc')
                 ->orderby('st_zq_competition.match_time','desc')
                 ->where($where)
                 ->orwhere($orwhere)
                 ->paginate ($list);
         } else {
-            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
-                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.id')
+                ->join('st_zq_local_match','st_zq_competition.id','=','st_zq_local_match.match_id')
+                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
+                ->select('st_zq_competition.id','st_zq_local_match.match_id','st_zq_local_league.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
                 ->orderby('st_zq_competition.match_date','desc')
                 ->orderby('st_zq_competition.match_time','desc')
                 ->paginate ($list);
         }
 
+
+
+//        if (is_array ($where) && count ($where) > 0) {
+//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
+//                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+//                ->orderby('st_zq_competition.match_date','desc')
+//                ->orderby('st_zq_competition.match_time','desc')
+//                ->where($where)
+//                ->orwhere($orwhere)
+//                ->paginate ($list);
+//        } else {
+//            $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
+//                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+//                ->orderby('st_zq_competition.match_date','desc')
+//                ->orderby('st_zq_competition.match_time','desc')
+//                ->paginate ($list);
+//        }
+
         if (!$data < 0) {
             return -2021052003; //
         }