|
|
@@ -20,12 +20,12 @@ class SportsfootController extends Controller {
|
|
|
$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
|
|
|
$request['status'] = isset($req->status) ? trim($req->status) : '-1';
|
|
|
$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
|
|
|
- $request['name_chinese'] = isset($req->name_chinese) ? $req->name_chinese : null;
|
|
|
$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
|
|
|
$request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
|
|
|
$newapp = new \App\Models\SoccerLeague();
|
|
|
$data = $newapp->allleague();
|
|
|
$request['league'] = $data;//联赛id
|
|
|
+ $request['token'] = session('adminInfo.token');//token 变量
|
|
|
|
|
|
$dt = \App\Lib\DataTable\DataTable::init();
|
|
|
$dt->setDataSource('/admin/sportsfoot/outcomeinfo');
|
|
|
@@ -175,8 +175,8 @@ class SportsfootController extends Controller {
|
|
|
|
|
|
if($ret['status']==1){
|
|
|
$SettlementOrder = new SettlementOrder();
|
|
|
- $nda = $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid);//串式
|
|
|
- $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
|
|
|
+ $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid);//串式
|
|
|
+ $nda = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
|
|
|
return responseToJson($nda);
|
|
|
}else{
|
|
|
return responseToJson($ret);
|
|
|
@@ -306,7 +306,6 @@ class SportsfootController extends Controller {
|
|
|
$status = Request::has('status') ? Request::get('status') : '';
|
|
|
$star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
|
|
|
$end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
|
|
|
- $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
|
|
|
|
|
|
$where = array();
|
|
|
$orwhere = array();
|
|
|
@@ -325,18 +324,18 @@ class SportsfootController extends Controller {
|
|
|
}
|
|
|
if ($status != -1) {
|
|
|
$where[] = array('st_zq_result.status', '=', $status);
|
|
|
- }
|
|
|
- if (!empty($name_chinese)) {
|
|
|
- $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
|
|
|
+ $orwhere[] = array('st_zq_result.status', '=', $status);
|
|
|
}
|
|
|
if(!is_numeric($home_team)){
|
|
|
if (!empty($star_time)) {
|
|
|
$star_time = date('Y-m-d H:i:s', strtotime($star_time));
|
|
|
$where[] = array('st_zq_result.start_time', '>', $star_time);
|
|
|
+ $orwhere[] = array('st_zq_result.start_time', '>', $star_time);
|
|
|
}
|
|
|
if (!empty($end_time)) {
|
|
|
$end_time = date('Y-m-d H:i:s', strtotime($end_time));
|
|
|
$where[] = array('st_zq_result.start_time', '<', $end_time);
|
|
|
+ $orwhere[] = array('st_zq_result.start_time', '<', $end_time);
|
|
|
}
|
|
|
}
|
|
|
$newapp = new \App\Models\Stzqresult();
|
彭俊