彭俊 6 rokov pred
rodič
commit
6fcc97af95
65 zmenil súbory, kde vykonal 5829 pridanie a 482 odobranie
  1. 156 0
      app/Http/Controllers/Admin/BqChampionsLeagueController.php
  2. 156 0
      app/Http/Controllers/Admin/LqChampionsLeagueController.php
  3. 89 6
      app/Http/Controllers/Admin/SoccerNoteListController.php
  4. 1 1
      app/Http/Controllers/Admin/SportsBaseController.php
  5. 1 1
      app/Http/Controllers/Admin/SportsBasketController.php
  6. 1 1
      app/Http/Controllers/Admin/SportsSoccerController.php
  7. 1 1
      app/Http/Controllers/Admin/SportsTennisController.php
  8. 162 54
      app/Http/Controllers/Admin/SportsfootController.php
  9. 78 17
      app/Http/Controllers/Admin/SportswqController.php
  10. 157 0
      app/Http/Controllers/Admin/WqChampionsLeagueController.php
  11. 198 0
      app/Http/Controllers/Admin/ZqChampionsLeagueController.php
  12. 1 1
      app/Http/Controllers/Api/SettlementController.php
  13. 859 177
      app/Http/Controllers/Api/WriteSportsController.php
  14. 7 0
      app/Http/Middleware/VerifyCsrfToken.php
  15. 1 0
      app/Http/Model/StBqOdds.php
  16. 2 0
      app/Http/Model/StBqOddsRecord.php
  17. 0 1
      app/Http/Model/StBqResult.php
  18. 1 1
      app/Http/Model/StGameType.php
  19. 2 0
      app/Http/Model/StLqOdds.php
  20. 2 0
      app/Http/Model/StLqOddsRecord.php
  21. 0 1
      app/Http/Model/StLqResult.php
  22. 2 0
      app/Http/Model/StWqOdds.php
  23. 1 0
      app/Http/Model/StWqOddsRecord.php
  24. 0 1
      app/Http/Model/StWqResult.php
  25. 57 0
      app/Http/Model/StZqOdds.php
  26. 2 0
      app/Http/Model/StZqOddsRecord.php
  27. 0 1
      app/Http/Model/StZqResult.php
  28. 19 0
      app/Http/Model/SystemUser.php
  29. 15 0
      app/Http/Response/Response.php
  30. 49 0
      app/Lib/Biz/Sport/Common.php
  31. 847 0
      app/Lib/Settlement/Adapter/RulePlus.php
  32. 1217 0
      app/Lib/Settlement/Adapter/ZqRule.php
  33. 6 3
      app/Lib/Settlement/SettlementOrder.php
  34. 27 5
      app/Lib/Settlement/SettlementWinFail.php
  35. 2 0
      app/Models/BaseLeague.php
  36. 2 0
      app/Models/BasketLeague.php
  37. 8 23
      app/Models/Comendnotice.php
  38. 3 1
      app/Models/SoccerLeague.php
  39. 8 6
      app/Models/SportsBase.php
  40. 8 6
      app/Models/SportsBasket.php
  41. 5 14
      app/Models/SportsNoteList.php
  42. 31 6
      app/Models/SportsSoccer.php
  43. 8 6
      app/Models/SportsTennis.php
  44. 10 0
      app/Models/Stbqresult.php
  45. 8 1
      app/Models/Stlqresult.php
  46. 9 0
      app/Models/Stwqresult.php
  47. 0 46
      app/Models/Stzqcompetition.php
  48. 9 0
      app/Models/Stzqresult.php
  49. 2 2
      app/Models/TennisLeague.php
  50. 60 0
      public/js/common.js
  51. 1 0
      resources/lang/zh-cn/sportsbase.php
  52. 290 0
      resources/views/ChampionsLeague/ZqChampionsLeague.blade.php
  53. 4 1
      resources/views/admin/Sportsbq/outcome.blade.php
  54. 31 29
      resources/views/admin/Sportswq/outcome.blade.php
  55. 3 0
      resources/views/admin/sportsbk/outcome.blade.php
  56. 39 12
      resources/views/admin/sportsfoot/outcome.blade.php
  57. 105 0
      resources/views/sports/base_champions_league_form.blade.php
  58. 105 0
      resources/views/sports/basket_champions_league_form.blade.php
  59. 73 0
      resources/views/sports/soccer_champions_league_form.blade.php
  60. 21 15
      resources/views/sports/soccer_league.blade.php
  61. 277 1
      resources/views/sports/sports_notelist.blade.php
  62. 457 0
      resources/views/sports/sports_search.blade.php
  63. 105 0
      resources/views/sports/tennis_champions_league_form.blade.php
  64. 0 41
      routes/api.php
  65. 28 0
      routes/web.php

+ 156 - 0
app/Http/Controllers/Admin/BqChampionsLeagueController.php

@@ -0,0 +1,156 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/22
+ * Time: 10:35
+ */
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Request;
+
+/**
+ * Class BqChampionsLeagueController
+ * @package App\Http\Controllers\Admin
+ * 棒球 冠军联赛 管理
+ */
+class BqChampionsLeagueController extends Controller
+{
+    public function index(Req $req) {
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $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['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();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
+        $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/BqChampionsLeague/info');
+        $dt->setLang('sportsbase');
+        $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));
+        $dt->addColsFields('league_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('utime', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        if (checkRriv('/admin/BqChampionsLeague/edit')) {
+            $arr[] = 'edit';
+        }
+        $dt->setToolBar($arr, array('width' => 140));
+        $dt->enableCheckBox();
+        return view('sports/base_league', $dt->render($request));
+    }
+
+    function info(Req $req) {
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $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') : '';
+        $status = Request::has('status') ? Request::get('status') : '';
+        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+
+        $where = array();
+        //$where[] = array('st_bq_league.identity', '=', '');
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_bq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_bq_league.area_id', '=', $area_id);
+        }
+        if(!empty($country_id)){
+            $where[] = array('st_bq_league.country_id', '=', $country_id);
+        }
+        if($status != 0){
+            $where[] = array('st_bq_league.status', '=', $status);
+        }
+
+        $newapp = new \App\Models\BaseLeague();
+        $data = $newapp->getinfo($list, $page, $where);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+    }
+
+    /**
+     *获取地区
+     */
+    function getarea() {
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        return $area;
+    }
+
+    /**
+     *修改冠军联赛信息
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+
+        $areas = $this->getarea();
+        if (!$areas) {
+            return -2;
+        }
+        $data = \App\Models\BaseLeague::where('id',$id)->first();
+        $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
+        $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
+        if(!empty($areaname)){
+            $data->area = $areaname->name;
+        }
+        if(!empty($countryname)){
+            $data->country = $countryname->name;
+        }
+
+        $odds_code = \App\Models\BaseOdds::where('lg_id',$id)->where('type',1)->where('odds_code','!=','')->select('odds_code')->distinct()->get();
+
+        $data = $data->toArray();
+
+        if (!$req->isMethod('post')) {
+
+            $data['area'] = $areas;
+            $data['odds_code'] = $odds_code;
+
+            return view('sports.base_champions_league_form', $data);
+        } else {
+            for($i=0;$i<count($odds_code);$i++){
+                $res = \App\Models\BqLeagueResult::where('lg_id',$id)->where('game_name',$odds_code[$i]->odds_code)->first();
+                //$model = new \App\Models\ZqLeagueResult();
+                $name = $odds_code[$i]->odds_code;
+                $update = [
+                    'lg_id' => $id,
+                    'F' => $name,
+                    'result' => $req->input($name),
+                    'ctime' => date('Y-m-d H:i:s',time()),
+                    'utime' => date('Y-m-d H:i:s',time()),
+                    'status' => 1,
+                ];
+                $update_info = [
+                    'result' => $req->input($name),
+                    'utime' => date('Y-m-d H:i:s',time()),
+                ];
+                if(!empty($res)){
+                    \App\Models\BqLeagueResult::where('game_name',$res->game_name)->update($update_info);
+                }else{
+                    \App\Models\BqLeagueResult::insert($update);
+                }
+            }
+            return responseToJson(1);
+        }
+    }
+}

+ 156 - 0
app/Http/Controllers/Admin/LqChampionsLeagueController.php

@@ -0,0 +1,156 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/22
+ * Time: 10:35
+ */
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Request;
+
+/**
+ * Class LqChampionsLeagueController
+ * @package App\Http\Controllers\Admin
+ * 篮球 冠军联赛 管理
+ */
+class LqChampionsLeagueController extends Controller
+{
+    public function index(Req $req) {
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $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['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();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
+        $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/LqChampionsLeague/info');
+        $dt->setLang('sportsbase');
+        $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));
+        $dt->addColsFields('league_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('utime', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        if (checkRriv('/admin/LqChampionsLeague/edit')) {
+            $arr[] = 'edit';
+        }
+        $dt->setToolBar($arr, array('width' => 140));
+        $dt->enableCheckBox();
+        return view('sports/basket_league', $dt->render($request));
+    }
+
+    function info(Req $req) {
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $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') : '';
+        $status = Request::has('status') ? Request::get('status') : '';
+        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+
+        $where = array();
+        //$where[] = array('st_lq_league.identity', '=', '');
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_lq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_lq_league.area_id', '=', $area_id);
+        }
+        if(!empty($country_id)){
+            $where[] = array('st_lq_league.country_id', '=', $country_id);
+        }
+        if($status != 0){
+            $where[] = array('st_lq_league.status', '=', $status);
+        }
+
+        $newapp = new \App\Models\BasketLeague();
+        $data = $newapp->getinfo($list, $page, $where);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+    }
+
+    /**
+     *获取地区
+     */
+    function getarea() {
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        return $area;
+    }
+
+    /**
+     *修改冠军联赛信息
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+
+        $areas = $this->getarea();
+        if (!$areas) {
+            return -2;
+        }
+        $data = \App\Models\BasketLeague::where('id',$id)->first();
+        $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
+        $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
+        if(!empty($areaname)){
+            $data->area = $areaname->name;
+        }
+        if(!empty($countryname)){
+            $data->country = $countryname->name;
+        }
+
+        $odds_code = \App\Models\BasketOdds::where('lg_id',$id)->where('type',1)->where('odds_code','!=','')->select('odds_code')->distinct()->get();
+
+        $data = $data->toArray();
+
+        if (!$req->isMethod('post')) {
+
+            $data['area'] = $areas;
+            $data['odds_code'] = $odds_code;
+
+            return view('sports.basket_champions_league_form', $data);
+        } else {
+            for($i=0;$i<count($odds_code);$i++){
+                $res = \App\Models\LqLeagueResult::where('lg_id',$id)->where('game_name',$odds_code[$i]->odds_code)->first();
+                //$model = new \App\Models\ZqLeagueResult();
+                $name = $odds_code[$i]->odds_code;
+                $update = [
+                    'lg_id' => $id,
+                    'F' => $name,
+                    'result' => $req->input($name),
+                    'ctime' => date('Y-m-d H:i:s',time()),
+                    'utime' => date('Y-m-d H:i:s',time()),
+                    'status' => 1,
+                ];
+                $update_info = [
+                    'result' => $req->input($name),
+                    'utime' => date('Y-m-d H:i:s',time()),
+                ];
+                if(!empty($res)){
+                    \App\Models\LqLeagueResult::where('game_name',$res->game_name)->update($update_info);
+                }else{
+                    \App\Models\LqLeagueResult::insert($update);
+                }
+            }
+            return responseToJson(1);
+        }
+    }
+}

+ 89 - 6
app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -34,7 +34,7 @@ class SoccerNoteListController extends Controller
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
         $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
-        $dt->setDataSource('/admin/SoccerNoteList/info');
+        $dt->setDataSource('/admin/SoccerNoteList/getinfo');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
@@ -48,13 +48,13 @@ class SoccerNoteListController extends Controller
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
-        $dt->addColsFields('game_status', array('sort' => false, 'width' =>90));
+        $dt->addColsFields('game_status', array('templet' => '#game_status','sort' => false, 'width' =>90));
         //$arr[] = 'view';
 //        if (checkRriv('/admin/SoccerNoteList/edit')) {
 //            $arr[] = 'edit';
 //        }
 //        $dt->setToolBar($arr, array('width' => 70));
-        $dt->enableCheckBox();
+        $dt->enableCheckBox();//var_dump($request['type']);
         return view('sports/sports_notelist', $dt->render($request));
     }
 
@@ -124,7 +124,7 @@ class SoccerNoteListController extends Controller
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
         $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
-        $dt->setDataSource('/admin/SoccerNoteList/getinfo');
+        $dt->setDataSource('/admin/SoccerNoteList/info');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('match_id_order', array('sort' => true, 'width' => 200));
@@ -145,7 +145,90 @@ class SoccerNoteListController extends Controller
 //        }
 //        $dt->setToolBar($arr, array('width' => 70));
         $dt->enableCheckBox();
-        return view('sports/sports_notelist', $dt->render($request));
+        return view('sports/sports_search', $dt->render($request));
+    }
+
+    //查询赛事结果
+    function Sairesult(Req $req){
+        $did = $req->did;
+        $qlgame = $req->qlgame?$req->qlgame:'zq';
+        $newapp = \App\Models\SportsNoteList::where('id', $did)->first();
+
+        if($qlgame=='zq'){
+            if($newapp['match_id']){
+                $newre = new \App\Models\Stzqresult();
+                $teamname = $newre->matchjg($newapp['match_id']);
+            }else{
+                $teamname ='';
+            }
+        }elseif($qlgame=='lq'){
+            if($newapp['match_id']){
+                $newre = new \App\Models\Stlqresult();
+                $teamname = $newre->matchjg($newapp['match_id']);
+            }else{
+                $teamname ='';
+            }
+        }elseif($qlgame=='bq'){
+            if($newapp['match_id']){
+                $newre = new \App\Models\Stbqresult();
+                $teamname = $newre->matchjg($newapp['match_id']);
+            }else{
+                $teamname ='';
+            }
+        }elseif($qlgame=='wq'){
+            if($newapp['match_id']){
+                $newre = new \App\Models\Stwqresult();
+                $teamname = $newre->matchjg($newapp['match_id']);
+            }else{
+                $teamname ='';
+            } 
+        }else{
+            $data = "参数错误";
+        }
+
+        $data =array(
+            'singleresult' => json_decode($newapp['single_result'],true),
+            'teamname' => $teamname,
+        );
+        return $data;
+    }
+
+    //结果添加
+    function addend(Req $req){
+        $did = $req->did;
+        $model = \App\Models\SportsNoteList::where('id', $did)->first();
+
+        $single_result = array(
+            'home_team' => $req->home_team?$req->home_team:0,//主队
+            'guest_team' => $req->guest_team?$req->guest_team:0,//客队
+            'home_score' => $req->home_score?$req->home_score:0,//主队进球
+            'guest_score' => $req->guest_score?$req->guest_score:0,//客队进球
+            'all_goal' => $req->all_goal?$req->all_goal:0,//总进球
+            'first_score' => $req->firstscore?$req->firstscore:0,//最先进球球队
+            'last_score' => $req->lastscore?$req->lastscore:0,//最后进球球队
+            'match_winer' => $req->matchwiner?$req->matchwiner:0,//赢球球队
+            'update_time' => time(),//更新时间
+            'match_id' => $req->match_id?$req->match_id:0,
+            'u_guest_score' => $req->u_guest_score?$req->u_guest_score:0,//上半场-主队进球数
+            'u_home_score' => $req->u_home_score?$req->u_home_score:0,//上半场-客队进球数
+            'penaltycard' => array(
+                'home'=>intval($req->homeallcard)?intval($req->homeallcard):0,
+                'guest'=>intval($req->guestallcard)?intval($req->guestallcard):0,
+                'home_half'=>intval($req->homehalfcard)?intval($req->homehalfcard):0,
+                'guest_half'=>intval($req->guesthalfcard)?intval($req->guesthalfcard):0,
+            ),
+            'cornerball' => array(
+                'home'=>intval($req->homeallcorner)?intval($req->homeallcorner):0,
+                'guest'=>intval($req->guestallcorner)?intval($req->guestallcorner):0,
+                'home_half'=>intval($req->homehalfcorner)?intval($req->homehalfcorner):0,
+                'guest_half'=>intval($req->guesthalfcorner)?intval($req->guesthalfcorner):0,
+            ),
+        );
+        $model->single_result = json_encode([$single_result]);
+        $model->result_flag = 1;
+
+        $model->save();
+        return responseToJson(1);
     }
 
     function getinfo()
@@ -157,7 +240,7 @@ class SoccerNoteListController extends Controller
         $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
         $order_id = Request::get('order_id') ? Request::get('order_id') : '';
         $match_id = Request::get('match_id') ? Request::get('match_id') : '';
-        $status = Request::has('status') ? Request::get('status') : '';
+        $status = Request::has('status') ? Request::get('status') : '-1';
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $type = Request::has('type') ? Request::get('type') : 'zq';

+ 1 - 1
app/Http/Controllers/Admin/SportsBaseController.php

@@ -42,7 +42,7 @@ class SportsBaseController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsBase/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));

+ 1 - 1
app/Http/Controllers/Admin/SportsBasketController.php

@@ -42,7 +42,7 @@ class SportsBasketController extends Controller {
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/SportsBasket/info');
 		$dt->setLang('sportsbase');
-		$dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
+		$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
 		$dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
 		$dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
 		$dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));

+ 1 - 1
app/Http/Controllers/Admin/SportsSoccerController.php

@@ -43,7 +43,7 @@ class SportsSoccerController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsSoccer/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));

+ 1 - 1
app/Http/Controllers/Admin/SportsTennisController.php

@@ -42,7 +42,7 @@ class SportsTennisController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsTennis/info');
         $dt->setLang('sportstennis');
-        $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));

+ 162 - 54
app/Http/Controllers/Admin/SportsfootController.php

@@ -68,12 +68,17 @@ class SportsfootController extends Controller {
         	'home_half'=>intval($req->homehalfcorner)?intval($req->homehalfcorner):0,
         	'guest_half'=>intval($req->guesthalfcorner)?intval($req->guesthalfcorner):0,
         );
+        $firstone = array(
+        	'teamscore'=>$req->firstscore ? $req->firstscore:0,
+        	'scoretime'=>intval($req->onescoretime)?intval($req->onescoretime):0,
+        	'scoretype'=>$req->firststye ? $req->firststye:0,
+        );
 
-		$model->first_score = $req->firstscore;
 		$model->last_score = $req->lastscore;
 		$model->match_winer = $req->matchwiner;
 		$model->penalty_card = json_encode($penaltycard);
 		$model->corner_ball = json_encode($cornerball);
+		$model->first_score = json_encode($firstone);
 
         $model->save();
         return responseToJson(1);
@@ -87,6 +92,7 @@ class SportsfootController extends Controller {
 		$array =array(
 			'corner_ball' => json_decode($newapp['corner_ball'],true),
 			'penalty_card' => json_decode($newapp['penalty_card'],true),
+			'first_score' => json_decode($newapp['first_score'],true),
 			'newapp' => $newapp,
 		);
 		return $array;
@@ -99,68 +105,170 @@ class SportsfootController extends Controller {
 		return $newapp;
 	}
 
-	//结算
+	//结算 allhalf全场1,半场0
 	function Settlement(Req $req){
-		//查询赛事下所有订单
-		$ssid = $req->match_id;//赛事id
-		$type = $req->type;//是否再结算1,首次结算2,再次结算
-		$newapp = new \App\Models\MoneyBuyMatch();
-		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
-		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-		$data = \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->first();
-		if($data){
-			$newapp = new \App\Lib\Settlement\SettlementWinFail();
-            \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>0]);
-			$ret = $newapp->doRun($data->toArray()['id']);
-			$ret2 =$data->toArray()['id'];
-            if ($ret2['status']==1){
-                \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>4]);
-            }
-        }
-		
-		if($ret['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($ret);
+		$allhalf = $req->allhalf?$req->allhalf:'';
+		if(intval($allhalf)){
+			//赛事id
+			$id = $req->input('id');
+			if (empty($id)) {
+				return responseToJson(-2001); //
+			}
+			$ids = explode(',', $id);
+			if (!is_array($ids) && intval($ids) < 0) {
+				return responseToJson(-2002); //
+			}
+			if (is_array($ids) && count($ids) > 0) {
+				foreach ($ids as $k => $v) {
+					if (intval($v) < 1) {
+						unset($ids[$k]);
+					}
+				}
+			}
+			for ($i=0; $i < count($ids); $i++) { 
+				$model = \App\Models\Stzqresult::where('id', $ids[$i])->select("match_id","status")->first();
+				//查询赛事下所有订单
+				$ssid = $model['match_id'];//赛事id
+				if($model['status']==2){
+					$type = 1;;//是否再结算1,首次结算2,再次结算
+				}else{
+					$type = 2;//
+				}
+				
+				$newapp = new \App\Models\MoneyBuyMatch();
+				$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
+				$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
+
+				$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->first();
+				if($data){
+					$tapp = new \App\Lib\Settlement\SettlementWinFail();
+		            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>0]);
+					$ret = $tapp->doRun($data->toArray()['id']);
+					$ret2 =$data->toArray()['id'];
+		            if ($ret2['status']==1){
+		                \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>4]);
+		            }
+		        }
+				
+				$SettlementOrder = new SettlementOrder();
+			    $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid,$allhalf);//串式
+			    $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid,$allhalf);//单式注单
+			}
+			return responseToJson(1);
+		}else{
+			//查询赛事下所有订单
+			$ssid = $req->match_id;//赛事id
+			$type = $req->type;//是否再结算1,首次结算2,再次结算
+			
+			$newapp = new \App\Models\MoneyBuyMatch();
+			$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
+			$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
+
+			$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->first();
+			if($data){
+				$tapp = new \App\Lib\Settlement\SettlementWinFail();
+	            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>0]);
+				$ret = $tapp->doRun($data->toArray()['id']);
+				$ret2 =$data->toArray()['id'];
+	            if ($ret2['status']==1){
+	                \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>4]);
+	            }
+	        }
+			
+			if($ret['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($ret);
+		    }
 	    }
 	}
 
 	//作废
-	function revoke(Req $req){
-		$match_id = $req->match_id;//赛事id
-		$model = \App\Models\Stzqresult::where('match_id', $match_id)->first();
-		$model->status = 4;
-		$model->save();
+	function revokeft(Req $req){
+		$iszf = $req->iszf?$req->iszf:'';//赛事id
+		if(intval($iszf)){
+			$id = $req->input('id');
+			if (empty($id)) {
+				return responseToJson(-2001); //
+			}
+			$ids = explode(',', $id);
+			if (!is_array($ids) && intval($ids) < 0) {
+				return responseToJson(-2002); //
+			}
+			if (is_array($ids) && count($ids) > 0) {
+				foreach ($ids as $k => $v) {
+					if (intval($v) < 1) {
+						unset($ids[$k]);
+					}
+				}
+			}
+			for ($ii=0; $ii < count($ids); $ii++) { 
+				$model = \App\Models\Stzqresult::where('id', $ids[$ii])->first();
+				$model->status = 4;
+				$model->save();
+				$ssid = $model['match_id'];//赛事id
+
+				$smodel = \App\Models\SportsSoccer::where('match_id', $ssid)->first();
+				if($smodel){
+					$smodel->status = 4;
+					$smodel->save();
+				}
 
-		$smodel = \App\Models\SportsSoccer::where('match_id', $match_id)->first();
-		if($smodel){
-			$smodel->status = 4;
-			$smodel->save();
-		}
+				$upapp = new \App\Models\SportsNoteList();
+		        $data = $upapp->updatesimplex($ssid,'zq');//修改单式状态
+
+		        //单式撤单返现
+		        $newapp = new \App\Models\MoneyBuyMatch();
+				$all = $newapp->allsimplexorder($ssid,'zq');
+		        for ($i=0; $i < count($all); $i++) { 
+			        $appgx = new \App\Lib\Settlement\SettlementOrder();
+			        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+		        }
+
+		        //串式撤单只改状态
+		        $str_ids = array_column($newapp->allstrorder($ssid),'order_id');
+		        $csapp = new \App\Models\MoneyBuyStr();
+		        $csapp->updatestatus($str_ids);//var_dump($ss);die;
+		        //修改money_buy_match 投注结果result=2为平
+		        $newapp->updatast($ssid);
+			}
+			return responseToJson(1);
+		}else{
+			$match_id = $req->match_id;//赛事id
+			$model = \App\Models\Stzqresult::where('match_id', $match_id)->first();
+			$model->status = 4;
+			$model->save();
 
-		$upapp = new \App\Models\SportsNoteList();
-        $data = $upapp->updatesimplex($match_id,'zq');//修改单式状态
+			$smodel = \App\Models\SportsSoccer::where('match_id', $match_id)->first();
+			if($smodel){
+				$smodel->status = 4;
+				$smodel->save();
+			}
 
-        //单式撤单返现
-        $newapp = new \App\Models\MoneyBuyMatch();
-		$all = $newapp->allsimplexorder($match_id,'zq');
-        for ($i=0; $i < count($all); $i++) { 
-	        $appgx = new \App\Lib\Settlement\SettlementOrder();
-	        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
-        }
+			$upapp = new \App\Models\SportsNoteList();
+	        $data = $upapp->updatesimplex($match_id,'zq');//修改单式状态
 
-        //串式撤单只改状态
-        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
-        $csapp = new \App\Models\MoneyBuyStr();
-        $csapp->updatestatus($str_ids);//var_dump($ss);die;
-        //修改money_buy_match 投注结果result=2为平
-        $newapp->updatast($match_id);
-        
-		return responseToJson(1);
+	        //单式撤单返现
+	        $newapp = new \App\Models\MoneyBuyMatch();
+			$all = $newapp->allsimplexorder($match_id,'zq');
+	        for ($i=0; $i < count($all); $i++) { 
+		        $appgx = new \App\Lib\Settlement\SettlementOrder();
+		        $appgx->insertData($all[$i]['order_id'], $all[$i]['money'], $all[$i]['account_identity'], '1', 'zq', $all[$i]['info_identity'], $all[$i]['money'],$all[$i]['match_id']);
+	        }
+
+	        //串式撤单只改状态
+	        $str_ids = array_column($newapp->allstrorder($match_id),'order_id');
+	        $csapp = new \App\Models\MoneyBuyStr();
+	        $csapp->updatestatus($str_ids);//var_dump($ss);die;
+	        //修改money_buy_match 投注结果result=2为平
+	        $newapp->updatast($match_id);
+	        
+			return responseToJson(1);
+		}
+		
 	}
 
 	//赛事结果修改

+ 78 - 17
app/Http/Controllers/Admin/SportswqController.php

@@ -124,25 +124,86 @@ class SportswqController extends Controller {
 
 	//结算
 	function Settlement(Req $req){
-		//查询赛事下所有订单
-		$ssid = $req->match_id;//赛事id
-		$type = $req->type;//是否再结算1,首次结算2,再次结算
-		$newapp = new \App\Models\MoneyBuyMatch();
-		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'wq'),'order_id');
-		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-		$update = $this->addcomendnotice($ssid);
-		if($update['status']==1){
-			$SettlementOrder = new SettlementOrder();
-	        $SettlementOrder->reSettlement($str_ids, 2,$type,'wq',$ssid);//串式
-	        $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'wq',$ssid);//单式注单
-	        return responseToJson($data);
-	    }else{
-	    	return responseToJson($update);
-	    }
+		$allhalf = $req->allhalf?$req->allhalf:'';
+		if(intval($allhalf)){
+			//赛事id
+			$id = $req->input('id');
+			if (empty($id)) {
+				return responseToJson(-2001); //
+			}
+			$ids = explode(',', $id);
+			if (!is_array($ids) && intval($ids) < 0) {
+				return responseToJson(-2002); //
+			}
+			if (is_array($ids) && count($ids) > 0) {
+				foreach ($ids as $k => $v) {
+					if (intval($v) < 1) {
+						unset($ids[$k]);
+					}
+				}
+			}
+			for ($i=0; $i < count($ids); $i++) { 
+				$model = \App\Models\Stwqresult::where('id', $ids[$i])->select("match_id","status")->first();
+				//查询赛事下所有订单
+				$ssid = $model['match_id'];//赛事id
+				if($model['status']==2){
+					$type = 1;;//是否再结算1,首次结算2,再次结算
+				}else{
+					$type = 2;//
+				}
+
+				$newapp = new \App\Models\MoneyBuyMatch();
+				$simplex_ids = array_column($newapp->allsimplexorder($ssid,'wq'),'order_id');
+				$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
+
+				$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->first();
+				if($data){
+					$tapp = new \App\Lib\Settlement\SettlementWinFail();
+		            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>0]);
+					$ret = $tapp->doRun($data->toArray()['id']);
+					$ret2 =$data->toArray()['id'];
+		            if ($ret2['status']==1){
+		                \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>4]);
+		            }
+		        }
+				
+				$SettlementOrder = new SettlementOrder();
+			    $SettlementOrder->reSettlement($str_ids, 2,$type,'wq',$ssid,$allhalf);//串式
+			    $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'wq',$ssid,$allhalf);//单式注单
+			}
+			return responseToJson(1);
+		}else{
+			//查询赛事下所有订单
+			$ssid = $req->match_id;//赛事id
+			$type = $req->type;//是否再结算1,首次结算2,再次结算
+				
+			$newapp = new \App\Models\MoneyBuyMatch();
+			$simplex_ids = array_column($newapp->allsimplexorder($ssid,'wq'),'order_id');
+			$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
+
+			$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->first();
+			if($data){
+				$tapp = new \App\Lib\Settlement\SettlementWinFail();
+		        \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>0]);
+				$ret = $tapp->doRun($data->toArray()['id']);
+				$ret2 =$data->toArray()['id'];
+		        if ($ret2['status']==1){
+		            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'wq'])->update(['status'=>4]);
+		        }
+		    }
+				
+			if($ret['status']==1){
+				$SettlementOrder = new SettlementOrder();
+			    $SettlementOrder->reSettlement($str_ids, 2,$type,'wq',$ssid);//串式
+			    $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'wq',$ssid);//单式注单
+			    return responseToJson($data);
+			}else{
+			    return responseToJson($ret);
+			}
+		}
 	}
 
-	//查询赛事结果
+	//查询赛事结果 
 	function Matchresult(Req $req){
 		$match_id = $req->match_id;
 		$newapp = \App\Models\Stwqresult::where('match_id', $match_id)->first();

+ 157 - 0
app/Http/Controllers/Admin/WqChampionsLeagueController.php

@@ -0,0 +1,157 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/22
+ * Time: 10:35
+ */
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Request;
+
+/**
+ * Class WqChampionsLeagueController
+ * @package App\Http\Controllers\Admin
+ * 网球 冠军联赛 管理
+ */
+class WqChampionsLeagueController extends Controller
+{
+    public function index(Req $req) {
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $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['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();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
+        $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/WqChampionsLeague/info');
+        $dt->setLang('sportsbase');
+        $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));
+        $dt->addColsFields('league_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('utime', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        if (checkRriv('/admin/WqChampionsLeague/edit')) {
+            $arr[] = 'edit';
+        }
+        $dt->setToolBar($arr, array('width' => 140));
+        $dt->enableCheckBox();
+        return view('sports/tennis_league', $dt->render($request));
+    }
+
+    function info(Req $req) {
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $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') : '';
+        $status = Request::has('status') ? Request::get('status') : '';
+        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+
+        $where = array();
+        //$where[] = array('st_wq_league.identity', '=', '');
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_wq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_wq_league.area_id', '=', $area_id);
+        }
+        if(!empty($country_id)){
+            $where[] = array('st_wq_league.country_id', '=', $country_id);
+        }
+        if($status != 0){
+            $where[] = array('st_wq_league.status', '=', $status);
+        }
+
+        $newapp = new \App\Models\TennisLeague();
+        $data = $newapp->getinfo($list, $page, $where);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+    }
+
+    /**
+     *获取地区
+     */
+    function getarea() {
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        return $area;
+    }
+
+    /**
+     *修改冠军联赛信息
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+
+        $areas = $this->getarea();
+        if (!$areas) {
+            return -2;
+        }
+        $data = \App\Models\TennisLeague::where('id',$id)->first();
+        $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
+        $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
+        if(!empty($areaname)){
+            $data->area = $areaname->name;
+        }
+        if(!empty($countryname)){
+            $data->country = $countryname->name;
+        }
+
+        $odds_code = \App\Models\TennisOdds::where('lg_id',$id)->where('type',1)->where('odds_code','!=','')->select('odds_code')->distinct()->get();
+
+        $data = $data->toArray();
+
+        if (!$req->isMethod('post')) {
+
+            $data['area'] = $areas;
+            $data['odds_code'] = $odds_code;
+
+            return view('sports.tennis_champions_league_form', $data);
+        } else {
+            for($i=0;$i<count($odds_code);$i++){
+                $res = \App\Models\WqLeagueResult::where('lg_id',$id)->where('game_name',$odds_code[$i]->odds_code)->first();
+                //$model = new \App\Models\ZqLeagueResult();
+                $name = $odds_code[$i]->odds_code;
+                $update = [
+                    'lg_id' => $id,
+                    'F' => $name,
+                    'result' => $req->input($name),
+                    'ctime' => date('Y-m-d H:i:s',time()),
+                    'utime' => date('Y-m-d H:i:s',time()),
+                    'status' => 1,
+                ];
+                $update_info = [
+                    'result' => $req->input($name),
+                    'utime' => date('Y-m-d H:i:s',time()),
+                ];
+                if(!empty($res)){
+                    \App\Models\WqLeagueResult::where('game_name',$res->game_name)->update($update_info);
+                }else{
+                    \App\Models\WqLeagueResult::insert($update);
+                }
+            }
+            return responseToJson(1);
+        }
+    }
+}

+ 198 - 0
app/Http/Controllers/Admin/ZqChampionsLeagueController.php

@@ -0,0 +1,198 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/22
+ * Time: 10:35
+ */
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Request;
+
+/**
+ * Class ZqChampionsLeagueController
+ * @package App\Http\Controllers\Admin
+ * 足球冠军联赛 管理
+ */
+class ZqChampionsLeagueController extends Controller
+{
+    public function index(Req $req) {
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $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['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')->where(['identity'=>''])->get();
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        $country = \App\Models\StAreaCountry::where('pid','!=',0)->get();
+        $request['league'] = $data;
+        $request['area'] = $area;
+        $request['country'] = $country;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/ZqChampionsLeague/info');
+        $dt->setLang('sportsbase');
+        $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));
+        $dt->addColsFields('league_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('utime', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('isresults', array('templet' => '#isresults', 'sort' => false, 'width' => 160));
+        // if (checkRriv('/admin/ZqChampionsLeague/edit')) {
+        //     $arr[] = 'edit';
+        // }
+        // $dt->setToolBar($arr, array('width' => 140));
+        $dt->enableCheckBox();
+        return view('sports/soccer_league', $dt->render($request));
+    }
+
+    function info(Req $req) {
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $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') : '';
+        $status = Request::has('status') ? Request::get('status') : '';
+        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+
+        $where = array();
+        //$where[] = array('st_zq_league.identity', '=', '');
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_zq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            }else{
+                $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+            }
+        }
+//        if ($name_chinese != -1) {
+//            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+//        }
+        if(!empty($area_id)){
+            $where[] = array('st_zq_league.area_id', '=', $area_id);
+        }
+        if(!empty($country_id)){
+            $where[] = array('st_zq_league.country_id', '=', $country_id);
+        }
+        if($status != 0){
+            $where[] = array('st_zq_league.status', '=', $status);
+        }
+
+        $newapp = new \App\Models\SoccerLeague();
+        $data = $newapp->getinfo($list, $page, $where);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+    }
+
+    /**
+     *获取地区
+     */
+    function getarea() {
+        $area = \App\Models\StAreaCountry::where('pid',0)->get();
+        return $area;
+    }
+
+    /**
+     *修改冠军联赛信息
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+
+        // $areas = $this->getarea();
+        // if (!$areas) {
+        //     return -2;
+        // }
+        $data = \App\Models\SoccerLeague::where('id',$id)->first();
+        $areaname = \App\Models\StAreaCountry::where('id',$data->area_id)->first();
+        $countryname = \App\Models\StAreaCountry::where('id',$data->country_id)->first();
+        if(!empty($areaname)){
+            $data->area = $areaname->name;
+        }
+        if(!empty($countryname)){
+            $data->country = $countryname->name;
+        }
+
+        $odds_code = \App\Models\SoccerOdds::where('lg_id',$id)->where('type',1)->where('odds_code','!=','')->select('odds_code')->distinct()->get()->toArray();//赔率表
+
+        $allteam = \App\Models\SoccerLeague::where('lg_id',$id)->select('name_chinese')->get()->toArray();
+        
+        $data = $data->toArray();
+
+        if (!$req->isMethod('post')) {
+
+            $data['allteam'] = $allteam;
+            $data['odds_code'] = $odds_code;
+
+            return view('sports.soccer_champions_league_form', $data);
+        } else {
+            // var_dump(count($allteam));die;
+            for($i=0;$i<count($odds_code);$i++){
+                // $tname = 'teammz'.$i;
+                for ($ic=0; $ic < count($allteam); $ic++) { 
+                    $team = 'teammz'.$i .$ic;
+                    $isteam = $req->$team .',';
+
+                    $res = \App\Models\ZqLeagueResult::where('lg_id',$id)->where('game_name',$odds_code[$i]['odds_code'])->first()->toArray();
+                    $addresult = [
+                        'lg_id' => $id,
+                        'game_name' => $name,
+                        'result' => $isteam,
+                        'ctime' => date('Y-m-d H:i:s',time()),
+                        'utime' => date('Y-m-d H:i:s',time()),
+                        'status' => 1,
+                    ];
+
+                    $updateresult = [
+                        'result' => $isteam,
+                        'utime' => date('Y-m-d H:i:s',time()),
+                    ];
+
+                    if(!empty($res)){
+                        \App\Models\ZqLeagueResult::where('game_name',$res['game_name'])->update($updateresult);
+                    }else{
+                        \App\Models\ZqLeagueResult::insert($addresult);
+                    }
+
+                    // \App\Models\ZqLeagueResult::where('game_name',$res['game_name'])->update($update_info);
+                }
+                // var_dump($isteam);
+                // $ss = count($teammz);
+                // for ($ie=0; $ie < count($teammz); $ie++) { 
+                //     $jieguo[] = $teammz[$ie];
+                // }
+                // $teammz[] = $req->$tname;
+                // $res = \App\Models\ZqLeagueResult::where('lg_id',$id)->where('game_name',$odds_code[$i]['odds_code'])->first()->toArray();
+                
+                // $name = $odds_code[$i]->odds_code;
+                // $update = [
+                //     'lg_id' => $id,
+                //     'game_name' => $name,
+                //     'result' => $req->input($name),
+                //     'ctime' => date('Y-m-d H:i:s',time()),
+                //     'utime' => date('Y-m-d H:i:s',time()),
+                //     'status' => 1,
+                // ];
+                // $update_info = [
+                //     'result' => $req->input($name),
+                //     'utime' => date('Y-m-d H:i:s',time()),
+                // ];
+                // if(!empty($res)){
+                //     \App\Models\ZqLeagueResult::where('game_name',$res['game_name'])->update($update_info);
+                // }else{
+                //     \App\Models\ZqLeagueResult::insert($update);
+                // }
+            }
+            return responseToJson(1);
+        }
+    }
+
+
+
+
+}

+ 1 - 1
app/Http/Controllers/Api/SettlementController.php

@@ -20,7 +20,7 @@ class SettlementController extends Controller
     public function index()
     {
         $dd = new ZqRule();
-        dd($dd->bodan(1,2,1));
+        dd($dd->sw_T1G(1,2,1));
     }
 
     public function dd()

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 859 - 177
app/Http/Controllers/Api/WriteSportsController.php


+ 7 - 0
app/Http/Middleware/VerifyCsrfToken.php

@@ -12,8 +12,15 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
+        'getToken',
         'setSports',
         'upMatch',
+        'setOdds',
+        'setOddsCH',
+        'setLeague',
+        'setMatch',
+        'setMatchResult',
+        'setBroadCast',
         //
     ];
 }

+ 1 - 0
app/Http/Model/StBqOdds.php

@@ -12,6 +12,7 @@ class StBqOdds extends Model
 {
     protected $table = 'st_bq_odds';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','sole','source','type','team','lg_id','others_lg_id','ctime','utime','expire_time'];
 
 
 }

+ 2 - 0
app/Http/Model/StBqOddsRecord.php

@@ -12,5 +12,7 @@ class StBqOddsRecord extends Model
 {
     protected $table = 'st_bq_odds_record';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','source','type','team','lg_id','others_lg_id','ctime','utime'];
+
 
 }

+ 0 - 1
app/Http/Model/StBqResult.php

@@ -87,7 +87,6 @@ class StBqResult extends Model
                 if ($ret != true) throw new \Exception(Response::generate('', Response::ADD_MATCH_R_ERROR));//Render([], '10022', lang('Tips','Sports')->get('add_match_r_error'));
             }
         }
-        return Response::success();
     }
 
     //计算滚球 赛事进行时间

+ 1 - 1
app/Http/Model/StGameType.php

@@ -15,7 +15,7 @@ class StGameType extends Model
 
     //根据球类代码 获取球类名称
     public static function getGameName($game_code= ''){
-        $gameName = self::where(['game_code'=>$game_code])->value('game_name');
+        $gameName = self::where('game_code',$game_code)->value('game_name');
         return $gameName;
     }
 

+ 2 - 0
app/Http/Model/StLqOdds.php

@@ -12,6 +12,8 @@ class StLqOdds extends Model
 {
     protected $table = 'st_lq_odds';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','sole','source','type','team','lg_id','others_lg_id','ctime','utime','expire_time'];
+
 
 
 }

+ 2 - 0
app/Http/Model/StLqOddsRecord.php

@@ -12,5 +12,7 @@ class StLqOddsRecord extends Model
 {
     protected $table = 'st_lq_odds_record';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','source','type','team','lg_id','others_lg_id','ctime','utime'];
+
 
 }

+ 0 - 1
app/Http/Model/StLqResult.php

@@ -99,7 +99,6 @@ class StLqResult extends Model
                 if($ret != true) throw new \Exception( Response::generate('',Response::ADD_MATCH_R_ERROR));//Render([], '10022', lang('Tips','Sports')->get('add_match_r_error'));
             }
         }
-        return Response::success();
     }
 
     //计算滚球 赛事进行时间

+ 2 - 0
app/Http/Model/StWqOdds.php

@@ -12,6 +12,8 @@ class StWqOdds extends Model
 {
     protected $table = 'st_wq_odds';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','sole','source','type','team','lg_id','others_lg_id','ctime','utime','expire_time'];
+
 
 
 }

+ 1 - 0
app/Http/Model/StWqOddsRecord.php

@@ -12,5 +12,6 @@ class StWqOddsRecord extends Model
 {
     protected $table = 'st_wq_odds_record';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','source','type','team','lg_id','others_lg_id','ctime','utime'];
 
 }

+ 0 - 1
app/Http/Model/StWqResult.php

@@ -87,7 +87,6 @@ class StWqResult extends Model
                 if ($ret != true) throw new \Exception(Response::generate('', Response::ADD_MATCH_R_ERROR));//Render([], '10022', lang('Tips','Sports')->get('add_match_r_error'));
             }
         }
-        return Response::success();
     }
 
     //计算滚球 赛事进行时间

+ 57 - 0
app/Http/Model/StZqOdds.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Http\Model;
 
+use function foo\func;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -12,6 +14,7 @@ class StZqOdds extends Model
 {
     protected $table = 'st_zq_odds';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','sole','source','type','team','lg_id','others_lg_id','ctime','utime','expire_time'];
 
     /*
      * 获取一段时间内所有的赔率
@@ -23,4 +26,58 @@ class StZqOdds extends Model
             ->toArray();
         return $Odds_data;
     }
+
+    /*
+     * 更新赛事下赔率状态
+     */
+    public static function upOddsStatus($model=[],$others_match_id='',$others_lg_id=[],$source='',$odds_only=[]){
+        $where = [];
+        //普通 赔率
+        if(!empty($others_match_id) and !empty($source)){
+            $where = [
+                ['others_match_id','=',$others_match_id],
+                ['source','=',$source]
+            ];
+            //获取当前 赛事 所有 赔率only
+            $odds_data = $model['model_odds']::select('odds_only')
+            ->where($where)
+            ->get()
+            ->toArray();
+        }
+        //冠军联赛 赔率
+        if(!empty($others_lg_id) and !empty($source)){
+            //获取当前 赛事 所有 赔率only
+            $odds_data = $model['model_odds']::select('odds_only')
+            ->whereIn('others_lg_id',$others_lg_id)
+            ->where(['source','=',$source])
+            ->get()
+            ->toArray();
+        }
+       
+
+        if(empty($odds_data)) return true;
+
+        //去除 本次请求的 赔率only
+        if(is_array($odds_data) and !empty($odds_only)){
+            foreach ($odds_data as $k => $v){
+                foreach ($odds_only as $kk => $vv){
+                    if($v['odds_only'] == $vv) unset($odds_data[$k]);
+                }
+            }
+        }
+        if(empty($odds_data)) return true;
+
+        //降维 获取所有only
+        $only = [];
+        if(is_array($odds_data)){
+            foreach ($odds_data as $k => $v){
+                $only[] = $v['odds_only'];
+            }
+        }
+        //批量更新 赔率状态
+        $ds = $model['model_odds']::whereIn('odds_only', $only)
+            ->update(['status' => -1]);
+
+        if($ds > 0 ) return true;
+    }
 }

+ 2 - 0
app/Http/Model/StZqOddsRecord.php

@@ -12,6 +12,8 @@ class StZqOddsRecord extends Model
 {
     protected $table = 'st_zq_odds_record';
     public $timestamps = false;
+    protected $fillable = ['match_id','others_match_id','odds_code','status','sort','p_code','odds','condition','odds_only','source','type','team','lg_id','others_lg_id','ctime','utime'];
+
 
     /*
      * 获取一段时间内所有的赔率记录

+ 0 - 1
app/Http/Model/StZqResult.php

@@ -86,7 +86,6 @@ class StZqResult extends Model
                 if ($ret != true) throw new \Exception(Response::generate('', Response::ADD_MATCH_R_ERROR));//Render([], '10022', lang('Tips','Sports')->get('add_match_r_error'));
             }
         }
-        return Response::success();
     }
 
     //计算滚球 赛事进行时间

+ 19 - 0
app/Http/Model/SystemUser.php

@@ -0,0 +1,19 @@
+<?php
+namespace App\Http\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+
+/**
+ * Class SystemUser
+ * @package App\Http\Model
+ * 管理员
+ */
+class SystemUser extends Model
+{
+
+    protected $table = 'system_user';
+    public $timestamps = false;
+
+
+}

+ 15 - 0
app/Http/Response/Response.php

@@ -29,6 +29,15 @@ class Response
     const MATCHID_NULL = 10029;
     const UPSTATUS_ERROR = 10030;
 
+    //===更新赔率 状态===
+    const ODDS_SOLE_ERR = 10031;
+
+    //===获取 用户token ==
+    const TOKEN_ERR = 10032;
+
+    //联赛uuid 为空
+    const LG__UUID_NULL = 10033;
+
 
     private static $errorMsgs = [
         self::SUCCESS => '成功',
@@ -55,6 +64,12 @@ class Response
         //===更新赛事状态===
         self::MATCHID_NULL =>'未获取到相关赛事',
         self::UPSTATUS_ERROR =>'赛事状态更新失败',
+        //===更新赔率状态===
+        self::ODDS_SOLE_ERR =>'更新赔率状态失败',
+        //===获取用户 token===
+        self::TOKEN_ERR => '用户token异常,请重新获取',
+        //===联赛uuid 为空====
+        self::LG__UUID_NULL=> '联赛uuid为空',
     ];
 
     public static function getMsg($code)

+ 49 - 0
app/Lib/Biz/Sport/Common.php

@@ -1085,6 +1085,55 @@ class Common {
         }
         return false;
     }
+
+    /**
+     * 二维数组根据某个字段去重
+     * @param array $array  二维数组
+     * @para array  去重后的数组
+     */
+    static function uniquArr($array,$key){
+        $result = array();
+        foreach($array as $k=>$val){
+            $code = false;
+            foreach($result as $_val){
+                if($_val[$key] == $val[$key]){
+                    $code = true;
+                    break;
+                }
+            }
+            if(!$code){
+                $result[]=$val;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * 二维数组 按指定键去重 
+     */
+    static function  uniquArrV2($array,$key){
+        $result = [];
+        foreach ($array as $val){
+           $keyval = $val[$key];
+           if  (!isset($result[$keyval])){
+             $result[$keyval] = $val;
+           }
+       }
+         return  array_values($result);
+     }
+     
+
+    /**
+     * 按字段 搜索 二维数组
+     */
+    static function searcharray($value, $key, $array,$r_key = '') {
+        foreach ($array as $k => $val) {
+            if ($val[$key] == $value) {
+                return $val[$r_key];
+            }
+        }
+        return null;
+     }
 }
 
 ?>

+ 847 - 0
app/Lib/Settlement/Adapter/RulePlus.php

@@ -312,6 +312,853 @@ trait RulePlus
         return $return;
     }
 
+    //双方球队进球 是--进球 否--没进球  sw_TS 
+    public function isgoal($resultModels, $model, $type, $allword){
+        $goalnum = intval($resultModels->home_score)+intval($resultModels->guest_score);
+        $goalhlefnum = intval($resultModels->u_home_score)+intval($resultModels->u_guest_score);
+
+        if($model->odds_code == $type){
+            if($goalnum != 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($goalnum == 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($goalhlefnum != 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($goalhlefnum == 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //独赢&进球大小  sw_MOU
+    public function isonlysize($resultModels, $model, $type, $allword){
+        $homeda = intval($resultModels->home_score)-intval($resultModels->guest_score);//主队大
+        $homexiao = intval($resultModels->guest_score)-intval($resultModels->home_score);//主队小
+        $guestda = intval($resultModels->guest_score)-intval($resultModels->home_score);//客队大
+        $guestxiao = intval($resultModels->home_score)-intval($resultModels->guest_score);//客队小
+        $allt = intval($resultModels->home_score)+intval($resultModels->guest_score);//共进球
+        $home = intval($resultModels->home_score);
+        $guest = intval($resultModels->guest_score);
+
+        if($model->odds_code == $type){
+            if($homeda > 1.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 1.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestda > 1.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt > 1.5 && $home==$guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home == $guest && $allt < 1.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 2.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 2.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestda > 2.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 2.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt > 2.5 && $home==$guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt < 2.5 && $home==$guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt < 2.5 && $home==$guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 3.5 ){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 3.5 ){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestda > 3.5 ){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestxiao > 3.5 ){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt > 3.5 && $home==$guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt < 3.5 && $home==$guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 4.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 4.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestda > 4.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestxiao > 4.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt > 4.5 && $home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allt < 4.5 && $home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guestxiao > 1.5 ){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //判断 独赢&双方球队进球 是--进球 否--没进球  sw_MTS
+    public function ishvgoal($resultModels, $model, $type, $allword){
+        $home = intval($resultModels->home_score);
+        $guest = intval($resultModels->guest_score);
+        
+        if($model->odds_code == $type){
+            if($home != 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home == 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guest != 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guest == 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home != $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //判断 进球大/小&双方球队进球  sw_OUT
+    public function goalsize($resultModels, $model, $type, $allword){
+        $homeda = intval($resultModels->home_score)-intval($resultModels->guest_score);//主队大
+        $homexiao = intval($resultModels->guest_score)-intval($resultModels->home_score);//主队小
+        $guestda = intval($resultModels->guest_score)-intval($resultModels->home_score);//客队大
+        $guestxiao = intval($resultModels->home_score)-intval($resultModels->guest_score);//客队小
+
+        if($model->odds_code == $type){
+            if($homeda > 1.5){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home == 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guest != 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($guest == 0){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home != $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //独赢 & 最先进球  ???   sw_MPG
+    public function firstball($resultModels, $model, $type, $allword){
+        $firstscore = $resultModels->first_score;//最先进球
+        $homename = $resultModels->home_team;//主队名
+        $guestname = $resultModels->guest_team;//客队名
+        $home = intval($resultModels->home_score);//主队得分
+        $guest = intval($resultModels->guest_score);//客队得分
+
+        if($model->odds_code == $type){
+            if($firstscore == $homename && $home > $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $guestname && $home > $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $homename && $home < $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $guestname && $home < $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $homename && $home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $guestname && $home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //首个进球方式  sw_FG
+    public function onewaygoal($resultModels, $model, $type, $allword){
+
+    }
+
+    //双重机会&进球大/小  sw_DU 
+    public function twosize($resultModels, $model, $type, $allword){
+        $homescore = $resultModels->home_score;//主队名
+        $guestscore = $resultModels->guest_score;//客队名
+        $allscore = intval($resultModels->guest_score) + intval($resultModels->home_score);//客队得分
+
+        if($model->odds_code == $type){
+            if($allscore > 1.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 1.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 1.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 1.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 1.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 1.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 2.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 2.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 2.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 2.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 2.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 2.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 3.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 3.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 3.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 3.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 3.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 3.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 4.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 4.5 && $homescore > $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 4.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 4.5 && $homescore < $guestscore || $homescore == $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore > 4.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($allscore < 4.5 && $homescore > $guestscore || $homescore < $guestscore){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //双重机会&双方球队进球  sw_DS 
+    public function allgoals($resultModels, $model, $type, $allword){
+        $home = intval($resultModels->home_score);//主队得分
+        $guest = intval($resultModels->guest_score);//客队得分
+
+        if($model->odds_code == $type){
+            if($home > $guest || $home == $guest){
+                if($home > 0 && $guest>0){
+                    return ['result' => 1, 'matchResult' => $allword];
+                }else{
+                    return ['result' => -1, 'matchResult' => $allword];
+                }
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home > $guest || $home == $guest){
+                if($home > 0 || $guest>0){
+                    return ['result' => 1, 'matchResult' => $allword];
+                }else{
+                    return ['result' => -1, 'matchResult' => $allword];
+                }
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home < $guest || $home == $guest){
+                if($home > 0 && $guest>0){
+                    return ['result' => 1, 'matchResult' => $allword];
+                }else{
+                    return ['result' => -1, 'matchResult' => $allword];
+                }
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home < $guest || $home == $guest){
+                if($home > 0 || $guest>0){
+                    return ['result' => 1, 'matchResult' => $allword];
+                }else{
+                    return ['result' => -1, 'matchResult' => $allword];
+                }
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home < $guest || $home > $guest){
+                if($home > 0 && $guest>0){
+                    return ['result' => 1, 'matchResult' => $allword];
+                }else{
+                    return ['result' => -1, 'matchResult' => $allword];
+                }
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($home < $guest || $home > $guest){
+                if($home > 0 || $guest>0){
+                    return ['result' => 1, 'matchResult' => $allword];
+                }else{
+                    return ['result' => -1, 'matchResult' => $allword];
+                }
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //双重机会&最先进球   sw_DG 
+    public function oneball($resultModels, $model, $type, $allword){
+        $firstscore = $resultModels->first_score;//最先进球
+        $home = intval($resultModels->home_score);//主队得分
+        $guest = intval($resultModels->guest_score);//客队得分
+        $homename = $resultModels->home_team;//主队
+        $guestname = $resultModels->guest_team;//客队
+
+        if($model->odds_code == $type){
+            if($firstscore == $homename && $home == $guest || $home > $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $guestname && $home == $guest || $home > $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $guestname && $home == $guest || $home < $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $homename && $home < $guest || $home > $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $guestname && $home < $guest || $home > $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($firstscore == $homename && $home < $guest || $home == $guest){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //进球大/小&进球单/双  sw_OUE
+    public function sizesd($resultModels, $model, $type, $allword){
+        $homeda = intval($resultModels->home_score) - intval($resultModels->guest_score);
+        $homexiao = intval($resultModels->guest_score) - intval($resultModels->home_score);
+        $allnum = intval($resultModels->home_score) + intval($resultModels->guest_score);
+
+        if ($allnum % 2 == 0) {
+            $text = '双';
+        } else {
+            $text = '单';
+        }
+
+        if($model->odds_code == $type){
+            if($homeda > 1.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 1.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 1.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 1.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 2.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 2.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 2.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 2.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 3.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 3.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 3.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 3.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 4.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 4.5 && $text == "单"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 4.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 4.5 && $text == "双"){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+    
+    //进球大/小&最先进球 sw_OUP
+    public function sizeone($resultModels, $model, $type, $allword){
+        $firstscore = $resultModels->first_score;
+        $homename = $resultModels->home_team;
+        $guestname = $resultModels->guest_team;
+        $homeda = intval($resultModels->home_score) - intval($resultModels->guest_score);
+        $homexiao = intval($resultModels->guest_score) - intval($resultModels->home_score);
+
+        if($model->odds_code == $type){
+            if($homeda > 1.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 1.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 2.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 2.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 3.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 3.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 3.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 2.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 2.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 1.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 1.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 4.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homeda > 4.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 4.5 && $firstscore == $homename){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 4.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else if($model->odds_code == $type){
+            if($homexiao > 3.5 && $firstscore == $guestname){
+                return ['result' => 1, 'matchResult' => $allword];
+            }else{
+                return ['result' => -1, 'matchResult' => $allword];
+            }
+        }else{
+            return ['result' => 100,'matchResult' => "参数不存在"];
+        }
+    }
+
+    //落后反超获胜  sw_BH
+    public function backwardwins(){
+
+    }
 
     private function doexchage(&$num1, &$num2)
     {

+ 1217 - 0
app/Lib/Settlement/Adapter/ZqRule.php

@@ -365,6 +365,9 @@ class ZqRule
      * @param $bet_match  投注赛事数据
      * @param $result_match  最终结果
      * @param $result_match_r  结果记录
+     * User: Tank
+     * Date: 2019/5/13
+     * Time: 10:19
      */
     public function bodan($bet_match, $result_match, $result_match_r)
     {
@@ -625,6 +628,9 @@ class ZqRule
 
     /**
      * 半场/全场 投注规则
+     * User: Tank
+     * Date: 2019/5/13
+     * Time: 10:19
      */
     public function half_full($bet_match, $result_match, $result_match_r)
     {
@@ -1148,5 +1154,1216 @@ class ZqRule
      * 发球相关  结束
      */
 
+    /*
+     * 双重机会
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_DC($bet_match='', $result_match=[], $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场得分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+        //双重机会
+        if ($p_code != 'sw_DC') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+        switch ($odds_code) {
+            case 'ior_DCHN':// 主队/和局
+                if ($full_home_score > $full_guest_score || $full_home_score == $full_guest_score) return $data;
+                break;
+            case 'ior_DCCN':// 客队/和局
+                if ($full_home_score < $full_guest_score || $full_home_score == $full_guest_score) return $data;
+                break;
+            case 'ior_DCHC':// 主队/客队
+                if ($full_home_score > $full_guest_score || $full_home_score < $full_guest_score) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+    /*
+     * 三项让球投注
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_W3($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+        //三项让球投注
+        if ($p_code != 'sw_W3') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_W3H':// 让球|主队 +1
+                //如果 主队-客队 比分 > 1,则 赢
+                if (($full_home_score - $full_guest_score) > 1) return $data;
+                $data['result'] = 2;
+                //如果 主队-客队 比分 = 1,则 平
+                if (($full_home_score - $full_guest_score) == 1) return $data;
+                break;
+            case 'ior_W3C':// 让球|客队 -1
+                $data['result'] = 2;
+                //如果 主队-客队 比分 = 1,则 平
+                if (($full_home_score - $full_guest_score) == 1) return $data;
+                break;
+            case 'ior_W3N':// 让球|和局 +1
+                //如果 主队-客队 比分 = 1,则 赢
+                if (($full_home_score - $full_guest_score) == 1) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 零失球
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_CS($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+        //零失球
+        if ($p_code != 'sw_CS') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+        switch ($odds_code) {
+            case 'ior_CSH':// 零失球|主队
+                //客队 比分 为 0
+                if ($full_guest_score == 0) return $data;
+                break;
+            case 'ior_CSC':// 零失球|客队
+                //主队 比分 为 0
+                if ($full_home_score == 0) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 零失球获胜
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_WN($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+        //零失球
+        if ($p_code != 'sw_WN') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+        switch ($odds_code) {
+            case 'ior_WNH':// 零失球获胜|主队
+                //客队 比分 为 0 并且 主队 大于 客队
+                if ($full_home_score > $full_guest_score and $full_guest_score == 0) return $data;
+                break;
+            case 'ior_WNC':// 零失球获胜|客队
+                //主队 比分 为 0 并且 客队 大于 主队
+                if ($full_home_score < $full_guest_score || $full_home_score == 0) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 赢得所有半场
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_WB($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+
+        //获取主客队上半场得分
+        $half_home_score = $result_match->u_home_score;
+        $half_guest_score = $result_match->u_guest_score;
+        //赢得所有半场
+        if ($p_code != 'sw_WB') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_WBH':// 赢得所有半场|主队
+                //上半场/下半场 都满足 主队 > 客队
+                if (($full_home_score - $half_home_score) > ($full_guest_score - $half_guest_score) and $half_home_score > $half_guest_score) return $data;
+                break;
+            case 'ior_WBC':// 赢得所有半场|客队
+                //上半场/下半场 都满足 主队 < 客队
+                if (($full_home_score - $half_home_score) < ($full_guest_score - $half_guest_score) and $half_home_score < $half_guest_score) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 赢得任一半场
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_WE($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+
+        //获取主客队上半场得分
+        $half_home_score = $result_match->u_home_score;
+        $half_guest_score = $result_match->u_guest_score;
+        //赢得任一半场
+        if ($p_code != 'sw_WE') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_WEH':// 赢得任一半场|主队
+                //上半场/下半场 任一满足 主队 > 客队
+                if (($full_home_score - $half_home_score) > ($full_guest_score - $half_guest_score) || $half_home_score > $half_guest_score) return $data;
+                break;
+            case 'ior_WEC':// 赢得任一半场|客队
+                //上半场/下半场 任一满足 主队 < 客队
+                if (($full_home_score - $half_home_score) < ($full_guest_score - $half_guest_score) || $half_home_score < $half_guest_score) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 双半场进球
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_SB($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+
+        //获取主客队上半场得分
+        $half_home_score = $result_match->u_home_score;
+        $half_guest_score = $result_match->u_guest_score;
+        //双半场进球
+        if ($p_code != 'sw_SB') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_SBH':// 双半场进球|主队
+                //上半场/下半场 主队都有 进球
+                if (($full_home_score - $half_home_score) > 0 and $half_home_score > 0) return $data;
+                break;
+            case 'ior_SBC':// 双半场进球|客队
+                //上半场/下半场 客队都有 进球
+                if (($full_guest_score - $half_guest_score) > 0 and $half_guest_score > 0) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 最多进球半场
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_HG($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+       
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+
+        //获取主客队上半场得分
+        $half_home_score = $result_match->u_home_score;
+        $half_guest_score = $result_match->u_guest_score;
+
+        //获取下半场得分
+        $lower_home_score = $full_home_score - $half_home_score;
+        $lower_guest_score = $half_guest_score - $half_guest_score;
+        //最多进球半场
+        if ($p_code != 'sw_HG') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_HGH':// 最多进球半场|上半场
+                //主队+客队上半场 > 主队+客队下半场
+                if (($half_home_score+$half_guest_score) > ($lower_home_score+$lower_guest_score)) return $data;
+                break;
+            case 'ior_HGC':// 最多进球半场|下半场
+                //主队+客队上半场 < 主队+客队下半场
+                if (($half_home_score+$half_guest_score) < ($lower_home_score+$lower_guest_score)) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 最多进球半场-独赢
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_MG($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+
+        //获取主客队全场比分
+        $full_home_score = $result_match->home_score;
+        $full_guest_score = $result_match->guest_score;
+
+        //获取主客队上半场得分
+        $half_home_score = $result_match->u_home_score;
+        $half_guest_score = $result_match->u_guest_score;
+
+        //获取下半场得分
+        $lower_home_score = $full_home_score - $half_home_score;
+        $lower_guest_score = $half_guest_score - $half_guest_score;
+        //最多进球半场-独赢
+        if ($p_code != 'sw_MG') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$full_home_score-$full_guest_score(全场)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_MGH':// 最多进球半场-独赢|上半场
+                //主队+客队上半场 > 主队+客队下半场  and 主队 独赢
+                if (($half_home_score+$half_guest_score) > ($lower_home_score+$lower_guest_score) and $full_home_score > $full_guest_score) return $data;
+                break;
+            case 'ior_MGC':// 最多进球半场-独赢|下半场
+                //主队+客队上半场 < 主队+客队下半场  and 主队 独赢
+                if (($half_home_score+$half_guest_score) < ($lower_home_score+$lower_guest_score) and $full_home_score > $full_guest_score) return $data;
+                break;
+            case 'ior_MGN':// 最多进球半场-独赢|和局
+                //全场主队 == 全场客队
+                if ($full_home_score == $full_guest_score) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+     /*
+     * 首个进球时间
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_T1G($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+        
+        //获取 首进球 时间
+        $first_score = json_decode($result_match->first_score, true);
+        $first_time_int = $first_score['scoretime'];//$result_match;//{"teamscore":0,"scoretime":0,"scoretype":0}
+        // $first_time_int = 0;
+        // if($first_time_str) {
+        //     $first_time_int = (int)substr($first_time_str,0,strpos($first_time_str, ':'));
+        // }
+
+        //首个进球时间
+        if ($p_code != 'sw_T1G') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$first_time_int(首进球时间)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_T1G1'://上半场开场-14:59分钟
+                if($first_time_int < 15) return $data;
+                break;
+            case 'ior_T1G2'://15:00分钟-29:59分钟
+                if(15 <= $first_time_int and $first_time_int < 30) return $data;
+                break;
+            case 'ior_T1G3'://30:00分钟-半场
+                if(30 <= $first_time_int and $first_time_int < 45) return $data;
+                break;
+            case 'ior_T1G4'://下半场开场-59:59分钟
+                if(45 <= $first_time_int and $first_time_int < 60) return $data;
+                break;
+            case 'ior_T1G5'://60:00分钟-74:59分钟
+                if(60 <= $first_time_int and $first_time_int < 75) return $data;
+                break;
+            case 'ior_T1G6'://75:00分钟-全场完场
+                if(75 <= $first_time_int and $first_time_int < 90) return $data;
+                break;
+            case 'ior_T1GN'://无进球
+                $data['matchResult'] = '没有进球';
+                if($first_time_int == 0) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+    /*
+     * 首个进球时间-3项
+     * User: Tank
+     * Date: 2019/6/28
+     * Time: 10:19
+     */
+    public function sw_T3G($bet_match='', $result_match='', $result_match_r=[]){
+        if (empty($bet_match) || empty($result_match)) return false;
+
+        $result_match = $result_match['0'];
+        //获取父/子级赔率代码
+        $p_code = $bet_match->p_code;
+        $odds_code = $bet_match->odds_code;
+        
+        //获取 首进球 时间
+        $first_score = json_decode($result_match->first_score, true);
+        $first_time_int = $first_score['scoretime'];//$result_match;//{"teamscore":0,"scoretime":0,"scoretype":0}
+        // $first_time_int = 0;
+        // if($first_time_str) {
+        //     $first_time_int = (int)substr($first_time_str,0,strpos($first_time_str, ':'));
+        // }
+
+
+        //首个进球时间-3项
+        if ($p_code != 'sw_T3G') return false;
+
+        //返回结果
+        $data = [
+            'result' => 1,
+            'matchResult' => "$first_time_int(首进球时间)"
+        ];
+
+        switch ($odds_code) {
+            case 'ior_T3G1'://第26分钟或之前
+                if($first_time_int <= 26) return $data;
+                break;
+            case 'ior_T3G2'://第27分钟或之后
+                if(27 <= $first_time_int) return $data;
+                break;
+            case 'ior_T1GN'://无进球
+                $data['matchResult'] = '没有进球';
+                if($first_time_int == 0) return $data;
+                break;
+            default:
+                return false;
+        }
+
+        $data['result'] = -1;
+        return $data;
+    }
+
+    /**
+     * 双方球队进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string jimy start
+     */
+    public function sw_TS($model, $resultModels, $resultRecords)
+    {
+        $resultModel = $resultModels['0'];
+        $allword = $resultModel->home_score . '-' . $resultModel->guest_score . "(全场)";
+        $hlefword = $resultModel->u_home_score . '-' . $resultModel->u_guest_score . "(上半场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_TSY":
+                $returnDatas = $this->isgoal($resultModel, $model, ior_TSY, $allword);
+                break;
+            case "ior_TSN":
+                $returnDatas = $this->isgoal($resultModel, $model, ior_TSN, $allword);
+                break;
+            case "ior_HTSY":
+                $returnDatas = $this->isgoal($resultModel, $model, ior_HTSY, $hlefword);
+                break;
+            case "ior_HTSN":
+                $returnDatas = $this->isgoal($resultModel, $model, ior_HTSN, $hlefword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+        return $returnDatas;
+    }
+
+    /**
+     * 独赢&进球大小
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string 
+     * 注:大1.5|和局 主队-客队大于1.5 并且为和局  小1.5|和局 主队-客队小于1.5 并且为和局
+     */
+    public function sw_MOU($model, $resultModels, $resultRecords)
+    {
+        $resultModel = $resultModels['0'];
+        $allword = $resultModel->home_score . '-' . $resultModel->guest_score . "(主队全场-客队全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_MOUAHO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUAHO, $allword);
+                break;
+            case "ior_MOUAHU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUAHU, $allword);
+                break;
+            case "ior_MOUACO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUACO, $allword);
+                break;
+            case "ior_MOUACU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUACU, $allword);
+                break;
+            case "ior_MOUANO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUANO, $allword);
+                break;
+            case "ior_MOUANU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUANU, $allword);
+                break;
+            case "ior_MOUBHO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUBHO, $allword);
+                break;
+            case "ior_MOUBHU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUBHU, $allword);
+                break;
+            case "ior_MOUBCO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUBCO, $allword);
+                break;
+            case "ior_MOUBCU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUBCU, $allword);
+                break;
+            case "ior_MOUBNO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUBNO, $allword);
+                break;
+            case "ior_MOUBNU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUBNU, $allword);
+                break;
+            case "ior_MOUCHO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUCHO, $allword);
+                break;
+            case "ior_MOUCHU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUCHU, $allword);
+                break;
+            case "ior_MOUCCO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUCCO, $allword);
+                break;
+            case "ior_MOUCCU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUCCU, $allword);
+                break;
+            case "ior_MOUCNO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUCNO, $allword);
+                break;
+            case "ior_MOUCNU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUCNU, $allword);
+                break;
+            case "ior_MOUDHO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUDHO, $allword);
+                break;
+            case "ior_MOUDHU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUDHU, $allword);
+                break;
+            case "ior_MOUDCO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUDCO, $allword);
+                break;
+            case "ior_MOUDCU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUDCU, $allword);
+                break;
+            case "ior_MOUDNO":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUDNO, $allword);
+                break;
+            case "ior_MOUDNU":
+                $returnDatas = $this->isonlysize($resultModel, $model, ior_MOUDNU, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+        return $returnDatas;
+    }
+
+     /**
+     * 独赢&双方球队进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string 
+     */
+    public function sw_MTS($model, $resultModels, $resultRecords)
+    {
+        $resultModel = $resultModels['0'];
+        $homeword = $resultModel->home_score . "(主队全场)";
+        $guestword = $resultModel->guest_score . "(客队全场)";
+        $allword = $resultModel->home_score . '-' . $resultModel->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_MTSHY":
+                $returnDatas = $this->ishvgoal($resultModel, $model, ior_MTSHY, $homeword);
+                break;
+            case "ior_MTSHN":
+                $returnDatas = $this->ishvgoal($resultModel, $model, ior_MTSHN, $homeword);
+                break;
+            case "ior_MTSCY":
+                $returnDatas = $this->ishvgoal($resultModel, $model, ior_MTSCY, $guestword);
+                break;
+            case "ior_MTSCN":
+                $returnDatas = $this->ishvgoal($resultModel, $model, ior_MTSCN, $guestword);
+                break;
+            case "ior_MTSNY":
+                $returnDatas = $this->ishvgoal($resultModel, $model, ior_MTSNY, $allword);
+                break;
+            case "ior_MTSNN":
+                $returnDatas = $this->ishvgoal($resultModel, $model, ior_MTSNN, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+        return $returnDatas;
+
+
+    }
+
+     /**
+     * 进球大/小&双方球队进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string 
+     */
+    public function sw_OUT($model, $resultModels, $resultRecords)
+    {
+        $resultModel = $resultModels['0'];
+        $homeword = $resultModel->home_score . "(主队全场)";
+        $guestword = $resultModel->guest_score . "(客队全场)";
+        $allword = $resultModel->home_score . '-' . $resultModel->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_OUTAOY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTAOY, $homeword);
+                break;
+            case "ior_OUTAON":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTAON, $homeword);
+                break;
+            case "ior_OUTAUY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTAUY, $guestword);
+                break;
+            case "ior_OUTAUN":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTAUN, $guestword);
+                break;
+            case "ior_OUTBOY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTBOY, $allword);
+                break;
+            case "ior_OUTBON":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTBON, $allword);
+                break;
+            case "ior_OUTBUY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTBUY, $homeword);
+                break;
+            case "ior_OUTBUN":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTBUN, $homeword);
+                break;
+            case "ior_OUTCOY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTCOY, $guestword);
+                break;
+            case "ior_OUTCON":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTCON, $guestword);
+                break;
+            case "ior_OUTCUY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTCUY, $allword);
+                break;
+            case "ior_OUTCUN":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTCUN, $allword);
+                break;
+            case "ior_OUTDOY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTDOY, $homeword);
+                break;
+            case "ior_OUTDON":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTDON, $homeword);
+                break;
+            case "ior_OUTDUY":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTDUY, $guestword);
+                break;
+            case "ior_OUTDUN":
+                $returnDatas = $this->goalsize($resultModel, $model, ior_OUTDUN, $guestword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 独赢 & 最先进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string  ??? 
+     */
+    public function sw_MPG($model, $resultModels, $resultRecords)
+    {
+        $resultModel = $resultModels['0'];
+        $allword = array(
+            'score' => $resultModel->home_score . '-' . $resultModel->guest_score . "(全场)",
+            'one_score' => $resultModel->first_score,//首进球
+        ); 
+            
+        $odds_code = $model->odds_code; 
+        switch ($odds_code) {
+            case "ior_MPGHH":
+                $returnDatas = $this->firstball($resultModel, $model, ior_MPGHH, $allword);
+                break;
+            case "ior_MPGHC":
+                $returnDatas = $this->firstball($resultModel, $model, ior_MPGHC, $allword);
+                break;
+            case "ior_MPGCH":
+                $returnDatas = $this->firstball($resultModel, $model, ior_MPGCH, $allword);
+                break;
+            case "ior_MPGCC":
+                $returnDatas = $this->firstball($resultModel, $model, ior_MPGCC, $allword);
+                break;
+            case "ior_MPGNH":
+                $returnDatas = $this->firstball($resultModel, $model, ior_MPGNH, $allword);
+                break;
+            case "ior_MPGNC":
+                $returnDatas = $this->firstball($resultModel, $model, ior_MPGNC, $allword);
+                break;
+            // case "ior_F2GH":
+            //     $returnDatas = $this->firstball($resultModel, $model, ior_F2GH, $allword);
+            //     break;
+            // case "ior_F3GH":
+            //     $returnDatas = $this->firstball($resultModel, $model, ior_F3GH, $allword);
+            //     break;
+            // case "ior_F3GC":
+            //     $returnDatas = $this->firstball($resultModel, $model, ior_F3GC, $allword);
+            //     break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 首个进球方式
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string  ?????
+     */
+    public function sw_FG($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $homeword = $resultModels->home_score . "(主队全场)";
+        $guestword = $resultModels->guest_score . "(客队全场)";
+        $allword = $resultModels->home_score . '-' . $resultModels->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_FGS":
+                $returnDatas = $this->onewaygoal($resultModels, $model, ior_FGS, $homeword);
+                break;
+            case "ior_FGH":
+                $returnDatas = $this->onewaygoal($resultModels, $model, ior_FGH, $homeword);
+                break;
+            case "ior_FGN":
+                $returnDatas = $this->onewaygoal($resultModels, $model, ior_FGN, $guestword);
+                break;
+            case "ior_FGP":
+                $returnDatas = $this->onewaygoal($resultModels, $model, ior_FGP, $guestword);
+                break;
+            case "ior_FGF":
+                $returnDatas = $this->onewaygoal($resultModels, $model, ior_FGF, $allword);
+                break;
+            case "ior_FGO":
+                $returnDatas = $this->onewaygoal($resultModels, $model, ior_FGO, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 双重机会&进球大/小
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string    
+     */
+    public function sw_DU($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $homeword = $resultModels->home_score . "(主队全场)";
+        $guestword = $resultModels->guest_score . "(客队全场)";
+        $allword = $resultModels->home_score . '-' . $resultModels->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_DUAHO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUAHO, $homeword);
+                break;
+            case "ior_DUAHU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUAHU, $homeword);
+                break;
+            case "ior_DUACO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUACO, $guestword);
+                break;
+            case "ior_DUACU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUACU, $guestword);
+                break;
+            case "ior_DUASO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUASO, $allword);
+                break;
+            case "ior_DUASU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUASU, $allword);
+                break;
+            case "ior_DUBHO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUBHO, $homeword);
+                break;
+            case "ior_DUBHU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUBHU, $homeword);
+                break;
+            case "ior_DUBCO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUBCO, $guestword);
+                break;
+            case "ior_DUBCU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUBCU, $guestword);
+                break;
+            case "ior_DUBSO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUBSO, $allword);
+                break;
+            case "ior_DUBSU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUBSU, $allword);
+                break;
+            case "ior_DUCHO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUCHO, $homeword);
+                break;
+            case "ior_DUCHU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUCHU, $homeword);
+                break;
+            case "ior_DUCCO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUCCO, $guestword);
+                break;
+            case "ior_DUCCU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUCCU, $guestword);
+                break;
+            case "ior_DUCSO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUCSO, $allword);
+                break;
+            case "ior_DUCSU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUCSU, $allword);
+                break;
+            case "ior_DUDHO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUDHO, $homeword);
+                break;
+            case "ior_DUDHU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUDHU, $homeword);
+                break;
+            case "ior_DUDCO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUDCO, $guestword);
+                break;
+            case "ior_DUDCU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUDCU, $guestword);
+                break;
+            case "ior_DUDSO":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUDSO, $allword);
+                break;
+            case "ior_DUDSU":
+                $returnDatas = $this->twosize($resultModels, $model, ior_DUDSU, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 双重机会&双方球队进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string    
+     */
+    public function sw_DS($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $homeword = $resultModels->home_score . "(主队全场)";
+        $guestword = $resultModels->guest_score . "(客队全场)";
+        $allword = $resultModels->home_score . '-' . $resultModels->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_DSHY":
+                $returnDatas = $this->allgoals($resultModels, $model, ior_DSHY, $allword);
+                break;
+            case "ior_DSHN":
+                $returnDatas = $this->allgoals($resultModels, $model, ior_DSHN, $allword);
+                break;
+            case "ior_DSCY":
+                $returnDatas = $this->allgoals($resultModels, $model, ior_DSCY, $allword);
+                break;
+            case "ior_DSCN":
+                $returnDatas = $this->allgoals($resultModels, $model, ior_DSCN, $allword);
+                break;
+            case "ior_DSSY":
+                $returnDatas = $this->allgoals($resultModels, $model, ior_DSSY, $allword);
+                break;
+            case "ior_DSSN":
+                $returnDatas = $this->allgoals($resultModels, $model, ior_DSSN, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 双重机会&最先进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string   
+     */
+    public function sw_DG($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $word = array(
+            'home' => $resultModels->home_score . "(主队全场)",
+            'guest' => $resultModels->guest_score . "(客队全场)",
+            'firstscore' => $resultModels->first_score ."(最先进球)", 
+        );
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_DGHH":
+                $returnDatas = $this->oneball($resultModels, $model, ior_DGHH, $word);
+                break;
+            case "ior_DGHC":
+                $returnDatas = $this->oneball($resultModels, $model, ior_DGHC, $word);
+                break;
+            case "ior_DGCH":
+                $returnDatas = $this->oneball($resultModels, $model, ior_DGCH, $word);
+                break;
+            case "ior_DGCC":
+                $returnDatas = $this->oneball($resultModels, $model, ior_DGCC, $word);
+                break;
+            case "ior_DGSH":
+                $returnDatas = $this->oneball($resultModels, $model, ior_DGSH, $word);
+                break;
+            case "ior_DGSC":
+                $returnDatas = $this->oneball($resultModels, $model, ior_DGSC, $word);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 进球大/小&进球单/双
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string 
+     */
+    public function sw_OUE($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $allword = $resultModels->home_score . '-' . $resultModels->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_OUEAOO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEAOO, $allword);
+                break;
+            case "ior_OUEAOE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEAOE, $allword);
+                break;
+            case "ior_OUEAUO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEAUO, $allword);
+                break;
+            case "ior_OUEAUE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEAUE, $allword);
+                break;
+            case "ior_OUEBOO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEBOO, $allword);
+                break;
+            case "ior_OUEBOE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEBOE, $allword);
+                break;
+            case "ior_OUEBUO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEBUO, $allword);
+                break;
+            case "ior_OUEBUE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEBUE, $allword);
+                break;
+            case "ior_OUECOO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUECOO, $allword);
+                break;
+            case "ior_OUECOE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUECOE, $allword);
+                break;
+            case "ior_OUECUO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUECUO, $allword);
+                break;
+            case "ior_OUECUE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUECUE, $allword);
+                break;
+            case "ior_OUEDOO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEDOO, $allword);
+                break;
+            case "ior_OUEDOE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEDOE, $allword);
+                break;
+            case "ior_OUEDUO":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEDUO, $allword);
+                break;
+            case "ior_OUEDUE":
+                $returnDatas = $this->sizesd($resultModels, $model, ior_OUEDUE, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 进球大/小&最先进球
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string 
+     */
+    public function sw_OUP($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $allword = array(
+            'score' => $resultModels->home_score . '-' . $resultModels->guest_score . "(全场)",
+            'firstscore' => $resultModels->first_score,
+        );
+            
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_OUPAOH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPAOH, $allword);
+                break;
+            case "ior_OUPAOC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPAOC, $allword);
+                break;
+            case "ior_OUPAUH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPAUH, $allword);
+                break;
+            case "ior_OUPAUC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPAUC, $allword);
+                break;
+            case "ior_OUPBOH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPBOH, $allword);
+                break;
+            case "ior_OUPBOC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPBOC, $allword);
+                break;
+            case "ior_OUPBUH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPBUH, $allword);
+                break;
+            case "ior_OUPBUC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPBUC, $allword);
+                break;
+            case "ior_OUPCOH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPCOH, $allword);
+                break;
+            case "ior_OUPCOC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPCOC, $allword);
+                break;
+            case "ior_OUPCUH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPCUH, $allword);
+                break;
+            case "ior_OUPCUC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPCUC, $allword);
+                break;
+            case "ior_OUPDOH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPDOH, $allword);
+                break;
+            case "ior_OUPDOC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPDOC, $allword);
+                break;
+            case "ior_OUPDUH":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPDUH, $allword);
+                break;
+            case "ior_OUPDUC":
+                $returnDatas = $this->sizeone($resultModels, $model, ior_OUPDUC, $allword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
+
+    /**
+     * 落后反超获胜
+     * @param mixed $model 注单表数据
+     * @param mixed $resultModels 结果表数据
+     * @param mixed $resultRecords 结果记录表数据
+     * model--money_buy_match resultModels--st_zq_result resultRecords--st_zq_result_record
+     * @return string jimy end  ???
+     */
+    public function sw_BH($model, $resultModels, $resultRecords)
+    {
+        $resultModels = $resultModels['0'];
+        $homeword = $resultModels->home_score . "(主队全场)";
+        $guestword = $resultModels->guest_score . "(客队全场)";
+        $allword = $resultModels->home_score . '-' . $resultModels->guest_score . "(全场)";
+
+        $odds_code = $model->odds_code;
+        switch ($odds_code) {
+            case "ior_BHH":
+                $returnDatas = $this->backwardwins($resultModels, $model, ior_BHH, $homeword);
+                break;
+            case "ior_BHC":
+                $returnDatas = $this->backwardwins($resultModels, $model, ior_BHC, $homeword);
+                break;
+            default:
+                $returnDatas = ['result' => 2, 'matchResult' => '(玩法无规则异常)-' . $odds_code];
+        }
+    }
 
 }

+ 6 - 3
app/Lib/Settlement/SettlementOrder.php

@@ -337,9 +337,12 @@ class SettlementOrder extends SettlementBase
     //取消某个赛事订单的结算数据
     public function UndoSettlement($game_code, $match_id, $order_ids, $bettype)
     {
-        if ($this->set_type == 1) {
-            return;
-        }
+        /* 不管是首次还是再结算,都作下判断  这个流程暂时不用
+            if ($this->set_type == 1) {
+                  return;
+            }
+        */
+
         $modelSMD = new SettlementMiddleDetailModel();
         $hisData = $modelSMD->getSettledatas($game_code, $match_id, $bettype, $order_ids);
 

+ 27 - 5
app/Lib/Settlement/SettlementWinFail.php

@@ -35,6 +35,8 @@ class SettlementWinFail
 
     public $CompostionDatas = null; //赛事数据
 
+    public $buyKeyMatchIdModels = [];   //单式投注里 [手动更改,同一场比赛不同结果的情况]    订单按批次号,比赛号存放,用于查订单的数组
+
 
     //类型映射
     public $gameAllMap = [
@@ -163,6 +165,7 @@ class SettlementWinFail
         foreach ($buyModels as $val) {
             $batch_id = $val->batch_id;
             $buyKeyModel[$batch_id] = $val;
+            $this->buyKeyMatchIdModels[$val->batch_id][$val->match_id] = $val;
         }
         foreach ($buymatchModles as $val) {
             $batch_id = $val->batch_id;
@@ -203,6 +206,7 @@ class SettlementWinFail
 
         $buyModels = DB::table('money_buy_str')->whereIn('batch_id', $batch_ids_array)->get();
         $buyKeyModels = [];
+
         if (count($buyModels) == 0) {
             return true;
         }
@@ -239,32 +243,50 @@ class SettlementWinFail
         $fun = $sval->odds_code;
         $fun2 = $sval->p_code;
 
+        if ($sval->bet_type == 1 && !isset($this->buyKeyMatchIdModels[$sval->batch_id][$vsal->match_d])) {
+            throw  new \Exception('单式投注结果和对应订单关联有误!');
+        }
+
+
         if ($sval->p_code != 'gj') {
 
             if (count($this->resultModel) <= 0) {
                 throw  new \Exception('非冠军比赛结果数据不能为空');
             }
 
+            //如果手动更改了结果,就用更改后的结果,否则用默认的结果
+            if ($sval->bet_type == 1 && $this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->result_flag == 1) {
+                $now_result = json_decode($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->single_result, true);
+            } else {
+                $now_result = $this->resultModel;
+            }
+
             if ($this->RefClass->hasMethod($fun)) {
-                $winorfalse = $this->AdapterObj->$fun($sval, $this->resultModel, []);
+                $winorfalse = $this->AdapterObj->$fun($sval, $now_result, []);
             } elseif ($this->RefClass->hasMethod($fun2)) {
-                $winorfalse = $this->AdapterObj->$fun2($sval, $this->resultModel, []);
+                $winorfalse = $this->AdapterObj->$fun2($sval, $now_result, []);
             } else {
                 throw new \Exception('没有找到玩法输赢判断规则-01-' . $sval->id, 40010);
             }
         } else {
             $this->getGjDatas($sval);
 
+            //如果手动更改了结果,就用更改后的结果,否则用默认的结果
+            if ($sval->bet_type == 1 && $this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->result_flag == 1) {
+                $now_result = json_decode($this->buyKeyMatchIdModels[$sval->batch_id][$sval->match_d]->single_result, true);
+            } else {
+                $now_result = $this->gjModel;
+            }
+
             if ($this->RefClass->hasMethod($fun)) {
-                $winorfalse = $this->AdapterObj->$fun($sval, $this->gjModel, []);
+                $winorfalse = $this->AdapterObj->$fun($sval, $now_result, []);
             } elseif ($this->RefClass->hasMethod($fun2)) {
-                $winorfalse = $this->AdapterObj->$fun2($sval, $this->gjModel, []);
+                $winorfalse = $this->AdapterObj->$fun2($sval, $now_result, []);
             } else {
                 throw new \Exception('没有找到玩法输赢判断规则-02-' . $sval->id, 40010);
             }
         }
 
-
         if (!isset($winorfalse['result']) || !isset($winorfalse['matchResult'])) {
             throw new \Exception('输赢结果数据结构异常!', 40011);
         }

+ 2 - 0
app/Models/BaseLeague.php

@@ -22,11 +22,13 @@ class BaseLeague extends BaseModel {
                 ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.status','st_bq_league.utime')
                 ->orderby('st_bq_league.utime','desc')
                 ->where($where)
+                //->distinct('st_bq_league.id')
                 ->paginate ($list);
         }else{
             $data = $this
                 ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.status','st_bq_league.utime')
                 ->orderby('st_bq_league.utime','desc')
+                //->distinct('st_bq_league.id')
                 ->paginate ($list);
         }
         if (!$data) {

+ 2 - 0
app/Models/BasketLeague.php

@@ -24,11 +24,13 @@ class BasketLeague extends BaseModel {
                 ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.status','st_lq_league.utime')
                 ->orderby('st_lq_league.utime','desc')
                 ->where($where)
+                //->distinct('st_lq_league.id')
                 ->paginate ($list);
         }else{
             $data = $this
                 ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.status','st_lq_league.utime')
                 ->orderby('st_lq_league.utime','desc')
+                //->distinct('st_lq_league.id')
                 ->paginate ($list);
         }
         if (!$data) {

+ 8 - 23
app/Models/Comendnotice.php

@@ -6,38 +6,23 @@
 *------Create Time 2017-06-13 18:45:24------
 */
 namespace App\Models;
-
 use DB;
 
-
 class Comendnotice extends BaseModel {
 
     protected $table = 'comendnotice';
+    public $timestamps = false;
 
     //添加赛事结束纪录
-	function addcomendnotice($match_id){
-		$data = \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->first();
+	function addcomendnotice($match_id,$type){
+		$data = $this->where(['match_id'=>$match_id,'game_code'=>$type])->first();
 		if(!$data){
-			$model = new \App\Models\Comendnotice();
-			$model->status = 0;//联赛id
-			$model->game_code = 'zq';
-			$model->match_id = $match_id;//赛事id
-			$model->ctime = date('Y-m-d H:i:s');
-			$model->save();
-
-			$newapp = new \App\Lib\Settlement\SettlementWinFail();
-			$ret = $newapp->doRun($model->id);
-		}else{
-			$newapp = new \App\Lib\Settlement\SettlementWinFail();
-            \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>0]);
-			$ret = $newapp->doRun($data->toArray()['id']);
-			$ret2 =$data->toArray()['id'];
-            if ($ret2['status']==1){
-                \App\Models\Comendnotice::where(['match_id'=>$match_id,'game_code'=>'zq'])->update(['status'=>4]);
-            }
+			$res=$this->insert(['game_code'=>$type,'pcount'=>1,'match_id'=>$match_id,'ctime'=>date('Y-m-d H:i:s')]);
+			if(!$res){
+	            return -6030001222;
+	        }
 		}
-		return $ret;
+		return 1;
 	}
 
-
 }

+ 3 - 1
app/Models/SoccerLeague.php

@@ -20,15 +20,17 @@ class SoccerLeague extends BaseModel {
         }
         if (is_array ($where) && count ($where) > 0){
             $data = $this
-                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
+                //->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
                 ->select('st_zq_league.id','st_zq_league.name_chinese','st_zq_league.area_id','st_zq_league.country_id','st_zq_league.status','st_zq_league.utime')
                 ->orderby('st_zq_league.utime','desc')
                 ->where($where)
+                //->distinct('st_zq_league.id')
                 ->paginate ($list);
         }else{
             $data = $this
                 ->select('st_zq_league.id','st_zq_league.name_chinese','st_zq_league.area_id','st_zq_league.country_id','st_zq_league.status','st_zq_league.utime')
                 ->orderby('st_zq_league.utime','desc')
+                //->distinct('st_zq_league.id')
                 ->paginate ($list);
         }
         if (!$data) {

+ 8 - 6
app/Models/SportsBase.php

@@ -35,21 +35,23 @@ class SportsBase extends BaseModel {
 
         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','st_bq_competition.is_rollball','st_bq_competition.is_today','st_bq_competition.is_morningplate','st_bq_competition.is_stringscene')
+//                ->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_league.id as 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','st_bq_competition.is_rollball','st_bq_competition.is_today','st_bq_competition.is_morningplate','st_bq_competition.is_stringscene')
                 ->orderby('st_bq_competition.match_date','desc')
                 ->orderby('st_bq_competition.match_time','desc')
                 ->where($where)
                 ->orwhere($orwhere)
+                //->distinct('st_bq_competition.id')
                 ->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','st_bq_competition.is_rollball','st_bq_competition.is_today','st_bq_competition.is_morningplate','st_bq_competition.is_stringscene')
+//                ->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_league.id as 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','st_bq_competition.is_rollball','st_bq_competition.is_today','st_bq_competition.is_morningplate','st_bq_competition.is_stringscene')
                 ->orderby('st_bq_competition.match_date','desc')
                 ->orderby('st_bq_competition.match_time','desc')
+                //->distinct('st_bq_competition.id')
                 ->paginate ($list);
         }
 

+ 8 - 6
app/Models/SportsBasket.php

@@ -35,21 +35,23 @@ class SportsBasket extends BaseModel {
 
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_lq_league','st_lq_competition.lg_id','=','st_lq_league.id')
-                ->join('st_lq_local_match','st_lq_competition.id','=','st_lq_local_match.match_id')
-                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
-                ->select('st_lq_competition.id','st_lq_local_match.match_id','st_lq_local_league.lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend','st_lq_competition.is_rollball','st_lq_competition.is_today','st_lq_competition.is_morningplate','st_lq_competition.is_stringscene')
+//                ->join('st_lq_local_match','st_lq_competition.id','=','st_lq_local_match.match_id')
+//                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
+                ->select('st_lq_competition.id','st_lq_league.id as lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend','st_lq_competition.is_rollball','st_lq_competition.is_today','st_lq_competition.is_morningplate','st_lq_competition.is_stringscene')
                 ->orderby('st_lq_competition.match_date','desc')
                 ->orderby('st_lq_competition.match_time','desc')
                 ->where($where)
                 ->orwhere($orwhere)
+                //->distinct('st_lq_competition.id')
                 ->paginate ($list);
         } else {
             $data = $this->join('st_lq_league','st_lq_competition.lg_id','=','st_lq_league.id')
-                ->join('st_lq_local_match','st_lq_competition.id','=','st_lq_local_match.match_id')
-                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
-                ->select('st_lq_competition.id','st_lq_local_match.match_id','st_lq_local_league.lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend','st_lq_competition.is_rollball','st_lq_competition.is_today','st_lq_competition.is_morningplate','st_lq_competition.is_stringscene')
+//                ->join('st_lq_local_match','st_lq_competition.id','=','st_lq_local_match.match_id')
+//                ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
+                ->select('st_lq_competition.id','st_lq_league.id as lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend','st_lq_competition.is_rollball','st_lq_competition.is_today','st_lq_competition.is_morningplate','st_lq_competition.is_stringscene')
                 ->orderby('st_lq_competition.match_date','desc')
                 ->orderby('st_lq_competition.match_time','desc')
+                //->distinct('st_lq_competition.id')
                 ->paginate ($list);
         }
 

+ 5 - 14
app/Models/SportsNoteList.php

@@ -337,11 +337,11 @@ class SportsNoteList extends BaseModel {
             }else if($data[$i]->status==3){
                 $data[$i]->order_status = '撤单';
             }
-            if($data[$i]->settle_status==1){
-                $data[$i]->settle_status = '未结算';
-            }else if($data[$i]->settle_status==2){
-                $data[$i]->settle_status = '已结算';
-            }
+            // if($data[$i]->settle_status==1){
+            //     $data[$i]->settle_status = '未结算';
+            // }else if($data[$i]->settle_status==2){
+            //     $data[$i]->settle_status = '已结算';
+            // }
             if($data[$i]->game_status==0){
                 $data[$i]->game_status = '未处理';
             }else{
@@ -410,7 +410,6 @@ class SportsNoteList extends BaseModel {
                     if(!empty(stristr($content[$b]->odds_code,'guest'))){
                         $data[$i]->team = $data[$i]->guest_team;
                     }
-
                     if($content[$b]->p_code == 'half_full'){
                         $string = str_replace('home',$data[$i]->home_team,$content[$b]->odds_code);
                         $string = str_replace('guest',$data[$i]->guest_team,$string);
@@ -423,9 +422,7 @@ class SportsNoteList extends BaseModel {
                     if($content[$b]->p_code == 'first_last_ball' || $content[$b]->p_code == 'half_full' || $content[$b]->p_code == 'capot' || $content[$b]->p_code == 'two_sides' || $content[$b]->p_code == 'total_goal'){
                         $content[$b]->condition = '';
                     }
-
                     $data[$i]->game_status = $data[$i]->game_status;
-
                     //投注详情
                     if(!empty($data[$i]->match_time)){
                         $data[$i]->content1 = '['.$data[$i]->match_time.']';
@@ -456,16 +453,10 @@ class SportsNoteList extends BaseModel {
                     }
                 }
             }
-
             $data[$i]->game_status = $data[$i]->settle_status;
-
             $data[$i]->content = $data[$i]->content1.$data[$i]->content;
-
         }
         return $data->toArray();
-
     }
 
-
-
 }

+ 31 - 6
app/Models/SportsSoccer.php

@@ -34,21 +34,23 @@ class SportsSoccer extends BaseModel {
         }
         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','st_zq_competition.is_rollball','st_zq_competition.is_today','st_zq_competition.is_morningplate','st_zq_competition.is_stringscene')
+//                ->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_league.id as 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','st_zq_competition.is_rollball','st_zq_competition.is_today','st_zq_competition.is_morningplate','st_zq_competition.is_stringscene')
                 ->orderby('st_zq_competition.match_date','desc')
                 ->orderby('st_zq_competition.match_time','desc')
                 ->where($where)
                 ->orwhere($orwhere)
+                //->distinct('st_zq_competition.id')
                 ->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','st_zq_competition.is_rollball','st_zq_competition.is_today','st_zq_competition.is_morningplate','st_zq_competition.is_stringscene')
+//                ->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_league.id as 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','st_zq_competition.is_rollball','st_zq_competition.is_today','st_zq_competition.is_morningplate','st_zq_competition.is_stringscene')
                 ->orderby('st_zq_competition.match_date','desc')
                 ->orderby('st_zq_competition.match_time','desc')
+                //->distinct('st_zq_competition.id')
                 ->paginate ($list);
         }
 
@@ -134,5 +136,28 @@ class SportsSoccer extends BaseModel {
         return 1;
     }
 
+    function resultlist($list = 10, $page, $where = '')
+    {
+        if (is_array ($where) && count ($where) > 0) {
+            $data = $this->orderby('id','desc')->where($where)->paginate ($list);
+        } else {
+            $data = $this->orderby('id','desc')->where($where)->paginate ($list);
+        }
+        if (!$data < 0) {
+            return -2021052003; //
+        }
+        return $data->toArray ();
+
+    }
+    
+    //足球赛事联赛查询
+    function allcompetition($lg_id){
+        $data = $this->where('lg_id',$lg_id)->select('id','home_team','guest_team')->get();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
+
 
 }

+ 8 - 6
app/Models/SportsTennis.php

@@ -35,21 +35,23 @@ class SportsTennis extends BaseModel {
 
         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','st_wq_competition.is_rollball','st_wq_competition.is_today','st_wq_competition.is_morningplate','st_wq_competition.is_stringscene')
+//                ->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_league.id as 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','st_wq_competition.is_rollball','st_wq_competition.is_today','st_wq_competition.is_morningplate','st_wq_competition.is_stringscene')
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
                 ->where($where)
                 ->orwhere($orwhere)
+                //->distinct('st_wq_competition.id')
                 ->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','st_wq_competition.is_rollball','st_wq_competition.is_today','st_wq_competition.is_morningplate','st_wq_competition.is_stringscene')
+//                ->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_league.id as 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','st_wq_competition.is_rollball','st_wq_competition.is_today','st_wq_competition.is_morningplate','st_wq_competition.is_stringscene')
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
+                //->distinct('st_wq_competition.id')
                 ->paginate ($list);
         }
 

+ 10 - 0
app/Models/Stbqresult.php

@@ -20,4 +20,14 @@ class Stbqresult extends BaseModel {
         }
         return $data->toArray ();
     }
+
+    //查询赛事
+    function matchjg($match_id){
+        $data = $this->where('match_id',$match_id)->select('id','home_team','guest_team')->first();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
+
 }

+ 8 - 1
app/Models/Stlqresult.php

@@ -50,7 +50,14 @@ class Stlqresult extends BaseModel
         return 1;
     }
 
-
+    //查询赛事
+    function matchjg($match_id){
+        $data = $this->where('match_id',$match_id)->select('id','home_team','guest_team')->first();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
 
 
 }

+ 9 - 0
app/Models/Stwqresult.php

@@ -20,6 +20,15 @@ class Stwqresult extends Model
         return $data->toArray ();
 
     }
+
+    //查询赛事
+    function matchjg($match_id){
+        $data = $this->where('match_id',$match_id)->select('id','home_team','guest_team')->first();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
 }
 
 ?>

+ 0 - 46
app/Models/Stzqcompetition.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-//足球赛事
-class Stzqcompetition extends Model
-{
-	protected $table = 'st_zq_competition';
-	public $timestamps = false;
-
-	// function resultlist(){
-	// 	$data=$this->orderby('id','desc')->whereIn('status',array(1))->paginate(1);
-
- //        if(!$data){
- //            return -6010000122;
- //        }
- //        return $data->toArray();
-	// }
-
-	function resultlist($list = 10, $page, $where = '')
-    {
-        if (is_array ($where) && count ($where) > 0) {
-            $data = $this->orderby('id','desc')->where($where)->paginate ($list);
-        } else {
-            $data = $this->orderby('id','desc')->where($where)->paginate ($list);
-        }
-        if (!$data < 0) {
-            return -2021052003; //
-        }
-        return $data->toArray ();
-
-	}
-	
-	//足球赛事联赛查询
-	function allcompetition($lg_id){
-		$data = $this->where('lg_id',$lg_id)->select('id','home_team','guest_team')->get();
-        if (!$data) {
-			return -5040000102; //无相关信息
-		}
-		return $data->toArray();
-	}
-	
-}
-
-?>

+ 9 - 0
app/Models/Stzqresult.php

@@ -58,5 +58,14 @@ class Stzqresult extends BaseModel
         return 1;
     }
 
+    //查询赛事
+    function matchjg($match_id){
+        $data = $this->where('match_id',$match_id)->select('id','home_team','guest_team')->first();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
+
 
 }

+ 2 - 2
app/Models/TennisLeague.php

@@ -24,14 +24,14 @@ class TennisLeague extends BaseModel {
                 ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.status','st_wq_league.utime')
                 ->orderby('st_wq_league.utime','desc')
                 ->where($where)
-                //->distinct('id')
+                //->distinct('st_wq_league.id')
                 ->paginate ($list);
         }else{
             $data = $this
                 ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.status','st_wq_league.utime')
                 ->orderby('st_wq_league.utime','desc')
                 ->orderby('utime','desc')
-                //->distinct('id')
+                //->distinct('st_wq_league.id')
                 ->paginate ($list);
         }
         if (!$data) {

+ 60 - 0
public/js/common.js

@@ -99,6 +99,66 @@ function delWin(url, ids) {
 
 }
 
+/**
+ * 结算全场
+ * @param  {[type]} url [description]
+ * @return {[type]}     [description]
+ */
+function allbalance(url, ids) {
+    ids = (ids == undefined || ids == '') ? g.currentDataTableIds : ids;
+    // console.log(1111);
+    if (ids == '' || ids == undefined) {
+        layer.msg('请先选择数据');
+        return;
+    }
+    layer.confirm('是否确认结算?', {
+        btn: ['确认', '取消'] //按钮
+    }, function() {
+        $.getJSON(url + ids, function(data, textStatus) {
+            if (data.status == '1') {
+                reloadDataTable();
+                g.currentDataTableIdArray=undefined;
+                layer.msg('结算成功');
+            } else {
+                layer.msg(data.msg);
+            }
+        });
+    }, function() {
+
+    });
+
+}
+
+/**
+ * 多赛事作废
+ * @param  {[type]} url [description]
+ * @return {[type]}     [description]
+ */
+function allrevoke(url, ids) {
+    ids = (ids == undefined || ids == '') ? g.currentDataTableIds : ids;
+    // console.log(1111);
+    if (ids == '' || ids == undefined) {
+        layer.msg('请先选择数据');
+        return;
+    }
+    layer.confirm('是否确认作废?', {
+        btn: ['确认', '取消'] //按钮
+    }, function() {
+        $.getJSON(url + ids, function(data, textStatus) {
+            if (data.status == '1') {
+                reloadDataTable();
+                g.currentDataTableIdArray=undefined;
+                layer.msg('作废成功');
+            } else {
+                layer.msg(data.msg);
+            }
+        });
+    }, function() {
+
+    });
+
+}
+
 $(document).ready(function() {
     $('*[eventType=eventForm]').submit(function() {
 

+ 1 - 0
resources/lang/zh-cn/sportsbase.php

@@ -18,6 +18,7 @@ return array(
     'country' => '国家',
     'league_status' => '联赛状态',
     'utime' => '修改时间',
+    'isresults' => '操作',
 
 );
 

+ 290 - 0
resources/views/ChampionsLeague/ZqChampionsLeague.blade.php

@@ -0,0 +1,290 @@
+@extends('vip.layouts')
+@section('seo_title')
+    足球联赛管理
+@endsection
+@section('content')
+    <style>
+        .layui-laydate-range {
+            width: auto;
+        }
+
+        .layui-form-switch em {
+            width: auto;
+        }
+
+        .layui-form-switch {
+            width: 44px;
+            line-height: 23px;
+        }
+        table .layui-form-switch em {
+            width: 36px;
+        }
+
+        table .layui-form-switch {
+            width: 56px;
+            line-height: 23px;
+        }
+        table .layui-form-onswitch i{
+            left:44px;
+        }
+
+        .layui-form-item .checkbox {
+            width: auto;
+        }
+        table{
+            text-align: center;
+        }
+        th div{
+            text-align: center;
+        }
+        input[type=date]::-webkit-inner-spin-button { visibility: hidden; }
+    </style>
+
+    <script type="text/html" id="recommend">
+        @if(checkRriv('/admin/SportsSoccer/recommendmatch'))<input type="checkbox" name="recommend" value="@{{d.id}}" lay-skin="switch" lay-text="推荐|不推荐" lay-filter="openRecommend" @{{ d.recommend == '1' ? 'checked' : '' }}>@endif
+    </script>
+
+    <div class="layui-row">
+        <div class="layui-col-xs12">
+            <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
+                <div class="layui-form-item">
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        {{--<div class="layui-input-inline">--}}
+                        {{--<input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">--}}
+                        {{--</div>--}}
+                        <div class="layui-input-inline">
+                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
+                        <div class="layui-input-inline checkbox">
+                            <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
+                            <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
+                        </div>
+                    </div>
+
+                    {{--<div class="layui-inline">--}}
+                    {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                    {{--<div class="layui-input-inline" style="width: 150px">--}}
+                    {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                    {{--<option value="-1"></option>--}}
+                    {{--@foreach($league as $k=>$v):--}}
+                    {{--@if($name_chinese==$v['name_chinese']))--}}
+                    {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                    {{--@else--}}
+                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                    {{--@endif--}}
+                    {{--@endforeach--}}
+                    {{--</select>--}}
+                    {{--</div>--}}
+                    {{--</div>--}}
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.area_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="area_id"  id="form_area_id" lay-filter="sect" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value></option>
+                                @foreach($area as $k=>$v):
+                                @if($area_id==$v['id']))
+                                <option value="{{$v['id']}}" selected="selected">{{$v['name']}}</option>
+                                @else
+                                    <option value="{{$v['id']}}">{{$v['name']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                            </select>
+                        </div>
+                    </div>
+
+                    {{--<div class="layui-inline">--}}
+                    {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
+                    {{--<div class="layui-input-inline">--}}
+                    {{--<input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>--}}
+                    {{--</div>--}}
+                    {{--</div>--}}
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="0"></option>
+                                @foreach(trans('status.league_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
+                        <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
+                        <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        @if(checkRriv('/admin/SoccerLeague/add'))<a href="/admin/SoccerLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/SoccerLeague/delete'))<a href="javascript:delWin('/admin/SoccerLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                    </div>
+
+                <!-- &nbsp;&nbsp;&nbsp;&nbsp;<div class="layui-inline"><a href="javascript:openWin('/admin/user/infoAdd','{{ trans('menu.menu_add') }}','700px','500px')" class="layui-btn layui-btn-sm  ">添加</a></div>
+                    <div class="layui-inline"><a href="/admin/menu/add" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div> -->
+
+                </div>
+            </form>
+        </div>
+    </div>
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        $(function () {
+            $('body').on('click', 'a[eventtype="event-delete"]', function () {
+                var span = $(this).prev();
+                var id = span.attr('data-id');
+                // openWin('/admin/system/AddMenu','{{ trans("menu.menu_edit")}}','600px','500px',id);
+            })
+            $('body').on('click','#form_sureblur~.layui-form-switch',function(){
+                var sus = $('#form_sureblur').next().text();
+                if(sus=='精确'){
+                    $('#form_sureblurs').val('on');
+                }else{
+                    $('#form_sureblurs').val('off');
+                }
+            })
+        })
+    </script>
+    @push('dataTableJS')
+        //var active = {
+        //    reload: function(){
+        //      //执行重载
+        //      table.reload('{{ $dataId }}', {
+        //        page: {
+        //          curr: 1 //重新从第 1 页开始
+        //        }
+        //        ,where: {
+        //            infoname:$('#infoname').val(),
+        //        }
+        //      });
+        //    }
+        //  };
+
+        function dataTableLoadFinished(res,curr,count){
+        var str='';
+        console.log(res);
+        }
+        //推荐|不推荐
+        form.on('switch(openRecommend)', function(obj){
+        var recommend = 0;
+        if(obj.elem.checked==true){
+        recommend = 1;
+        }
+        setcolumn('/admin/SportsSoccer/recommendmatch',this.name,recommend,this.value,obj);
+        //layer.tips(msg, obj.othis);
+        });
+
+        function setcolumn(url,column,value,id,obj){
+        $.ajax({
+        url: url+'?'+column+'='+value+'&id='+id,
+        dataType: 'json',
+        type: 'get',
+        success:function(data){
+        layer.msg(data.msg);
+        if(data.status!=1){
+        if(value==1){
+        obj.othis[0].setAttribute("class", "layui-unselect layui-form-switch");
+        obj.othis[0].innerHTML='<em>推荐</em><i></i>';
+        }else{
+        obj.othis[0].setAttribute("class",'layui-unselect layui-form-switch layui-form-onswitch');
+        obj.othis[0].innerHTML='<em>不推荐</em><i></i>';
+        }
+        }
+        }
+        });
+        }
+
+        //$('.lay-btn-diy').on('click', function(){
+        //    var type = $(this).data('type');
+        //    active[type] ? active[type].call(this) : '';
+        //  });
+
+        //重置表单
+        $('.reset').on('click',function(){
+        $('input').val('');
+        $('#infoname').val('');
+        //	  var type = $(this).data('type');
+        //	  active[type] ? active[type].call(this) : '';
+        });
+
+        //刷新表单
+        //    $('.set').on('click',function(){
+        //    var type = $(this).data('type');
+        //    active[type] ? active[type].call(this) : '';
+        //    });
+
+    @endpush
+    <script>
+        //赛事结果处理
+        function dealwith(url,ids) {
+            layer.confirm('是否确认处理?', {
+                btn: ['确认', '取消'] //按钮
+            }, function() {
+                $.getJSON(url, function(data, textStatus) {
+                    //console.log(data);
+                    if (data.status == '1') {
+                        reloadDataTable();
+                        layer.msg('处理成功');
+                    } else {
+                        layer.msg(data.msg);
+                    }
+                });
+            }, function() {
+
+            });
+
+        }
+    </script>
+    @include('vip.datatable')
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        var id;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                id = data.value;
+                //console.log(id);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SoccerLeague/getcountry',
+                    data:{id:id},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        //console.log(data);
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
+                        $("#country_id").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+    </script>
+@endsection

+ 4 - 1
resources/views/admin/Sportsbq/outcome.blade.php

@@ -224,7 +224,10 @@
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-xs" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('bq')">刷新赛事</i></a>
                         <!--@if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif-->
-                        @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        @if(checkRriv('/admin/sportsbq/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbq/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=1&id=');" class="layui-btn layui-btn-sm layui-btn-green set">结算全场</a>@endif
+                        @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-sm layui-btn-green set">重新结算上半场</a>@endif
                     </div>
                 </div>
             </form>

+ 31 - 29
resources/views/admin/Sportswq/outcome.blade.php

@@ -223,6 +223,9 @@
                         <a class="layui-btn layui-btn-xs" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('wq')">刷新赛事</i></a>
                         <!--@if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif-->
                         @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm layui-btn-green set">结算全场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm layui-btn-green set">重新结算上半场</a>@endif
                     </div>
                 </div>
             </form>
@@ -242,65 +245,65 @@
                     <div style="text-align:left;">
                         <div style="display:flex">
                             <li style="width: 110px;">第一局获胜队</li>
-                            <div>
-                                <input type="radio" name="onegame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="onegame" eventType="event-query" value="0" title="客队">客队
+                            <div id="onegame">
+                                <input type="radio" name="onegame" value="" checked>主队
+                                <input type="radio" name="onegame" value="" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第二局获胜队</li>
-                            <div>
-                                <input type="radio" name="twogame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="twogame" eventType="event-query" value="0" title="客队">客队
+                            <div id="twogame">
+                                <input type="radio" name="twogame" value="1" checked>主队
+                                <input type="radio" name="twogame" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第三局获胜队</li>
-                            <div>
-                                <input type="radio" name="threegame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="threegame" eventType="event-query" value="0" title="客队">客队
+                            <div id="threegame">
+                                <input type="radio" name="threegame" value="1" checked>主队
+                                <input type="radio" name="threegame" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第四局获胜队</li>
-                            <div>
-                                <input type="radio" name="fourgame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="fourgame" eventType="event-query" value="0" title="客队">客队
+                            <div id="fourgame">
+                                <input type="radio" name="fourgame" id="fourgame" eventType="event-query" value="1" checked>主队
+                                <input type="radio" name="fourgame" id="fourgame" eventType="event-query" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第五局获胜队</li>
-                            <div>
-                                <input type="radio" name="fivegame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="fivegame" eventType="event-query" value="0" title="客队">客队
+                            <div id="fourgame">
+                                <input type="radio" name="fivegame" id="fivegame" eventType="event-query" value="1" checked>主队
+                                <input type="radio" name="fivegame" id="fivegame" eventType="event-query" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第六局获胜队</li>
-                            <div>
-                                <input type="radio" name="sixgame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="sixgame" eventType="event-query" value="0" title="客队">客队
+                            <div id="sixgame">
+                                <input type="radio" name="sixgame" value="1" checked>主队
+                                <input type="radio" name="sixgame" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第七局获胜队</li>
-                            <div>
-                                <input type="radio" name="sevengame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="sevengame" eventType="event-query" value="0" title="客队">客队
+                            <div id="sevengame">
+                                <input type="radio" name="sevengame" value="1" checked>主队
+                                <input type="radio" name="sevengame" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第八局获胜队</li>
-                            <div>
-                                <input type="radio" name="eightgame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="eightgame" eventType="event-query" value="0" title="客队">客队
+                            <div id="eightgame">
+                                <input type="radio" name="eightgame" value="1" checked>主队
+                                <input type="radio" name="eightgame" value="0" >客队
                             </div>
                         </div>
                         <div style="display:flex">
                             <li style="width: 110px;">第九局获胜队</li>
-                            <div>
-                                <input type="radio" name="ninegame" eventType="event-query" value="1" title="主队" checked>主队
-                                <input type="radio" name="ninegame" eventType="event-query" value="0" title="客队">客队
+                            <div id="ninegame">
+                                <input type="radio" name="ninegame" value="1" checked>主队
+                                <input type="radio" name="ninegame" value="0" >客队
                             </div>
                         </div>
                     </div>
@@ -309,8 +312,7 @@
                     <button class="ok" onchange="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="no"><h3>取消</h3></button>
                 </div>
             </div>
-        </div>
-        
+        </div>        
 	<script>
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {

+ 3 - 0
resources/views/admin/sportsbk/outcome.blade.php

@@ -248,6 +248,9 @@
                         <a class="layui-btn layui-btn-xs" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('lq')">刷新赛事</i></a>
                         <!-- @if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=1&id=');" class="layui-btn layui-btn-sm layui-btn-green set">结算全场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-sm layui-btn-green set">重新结算上半场</a>@endif
                     </div>
                 </div>
             </form>

+ 39 - 12
resources/views/admin/sportsfoot/outcome.blade.php

@@ -131,10 +131,10 @@
             @{{#} }}
         @{{#} }}
         @{{#if(d.status!=4 && d.status!=3){ }}
-        <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revoke(@{{d.match_id}})">作废</li></span>
+        <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revokeft(@{{d.match_id}})">作废</li></span>
         @{{#} }}
         @{{#if(d.status==4){ }}
-        <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revoke(@{{d.match_id}})">已作废</li></span>
+        <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revokeft(@{{d.match_id}})">已作废</li></span>
         @{{#} }}
     </script>
 
@@ -218,7 +218,7 @@
                         </div>
                     </div>
 
-                    <div class="layui-inline">
+                    <!-- <div class="layui-inline">
                         <label class="layui-form-label">相关操作:</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name=""  id=""  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
@@ -229,7 +229,7 @@
                                 <option value="">设为无效</option>
                             </select>
                         </div>
-                    </div>
+                    </div> -->
 
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsfoot.star_time') }}</label>
@@ -252,6 +252,10 @@
                         <a class="layui-btn layui-btn-xs" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('zq')">刷新赛事</i></a>
                         <!-- @if(checkRriv('/admin/sportsfoot/addoutcome'))<a href="/admin/sportsfoot/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsfoot/deleteoutcome'))<a href="javascript:delWin('/admin/sportsfoot/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm layui-btn-green set">结算全场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm layui-btn-green set">重新结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/revokeft'))<a href="javascript:allrevoke('/admin/sportsfoot/revokeft?iszf=1&id=');" class="layui-btn layui-btn-sm  layui-btn-danger">作废</a>@endif
                     </div>
                 </div>
             </form>
@@ -275,13 +279,21 @@
                             <select name="firstscore" id="firstscore">
                             </select>
                         </div>
+                        <div style="display: flex;">
+                            <li>最先进球时间:</li><input type="text" id="onescoretime" name="onescoretime" value="" autocomplete="off">分钟
+                        </div>
+                        <div style="display: flex;">
+                            <li> 进 &nbsp; 球&nbsp; 方&nbsp;式&nbsp;:</li>
+                            <select name="firststye" id="firststye">
+                            </select>
+                        </div>
                         <div style="display: flex;">
                             <li>最后进球球队:</li>
                             <select name="lastscore" id="lastscore">
                             </select>
                         </div>
                         <div style="display: flex;">
-                            <li> 获 &nbsp;胜&nbsp; 球&nbsp; 队&nbsp;:</li><input type="text" id="matchwiner" name="matchwiner" value="">
+                            <li> 获 &nbsp; 胜&nbsp; 球&nbsp;队&nbsp;:</li><input type="text" id="matchwiner" name="matchwiner" value="">
                         </div>
                         <div style="display: flex;">
                             <li>主队全场角球:</li><input type="text" id="homeallcorner" name="homeallcorner" value="" autocomplete="off">
@@ -343,6 +355,7 @@
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
+                    // alert(data);
                     document.getElementById("matchwiner").value=data.newapp.match_winer;
                     document.getElementById("homeallcard").value=data.penalty_card.home;
                     document.getElementById("guestallcard").value=data.penalty_card.guest;
@@ -352,16 +365,26 @@
                     document.getElementById("guestallcorner").value=data.corner_ball.guest;
                     document.getElementById("homehalfcorner").value=data.corner_ball.home_half;
                     document.getElementById("guesthalfcorner").value=data.corner_ball.guest_half;
+                    document.getElementById("onescoretime").value=data.first_score.scoretime;//首进球时间
 
-                    firstscore = "<option value='"+ data.newapp.first_score +"' selected=''> ";
-                    if (data.newapp.first_score.length>0){
-                        firstscore += data.newapp.first_score ;
+                    firstscore = "<option value='"+ data.first_score.teamscore +"' selected=''> ";
+                    if (data.first_score.teamscore.length>0){
+                        firstscore += data.first_score.teamscore ;
                     }else{
                         firstscore += '请选择最先进球';
                     }
                     firstscore += " </option><option value=" +data.newapp.home_team + ">" + data.newapp.home_team + "</option><option value=" +data.newapp.guest_team + ">" + data.newapp.guest_team + "</option>";
                     $("#firstscore").html(firstscore);
 
+                    firststye = "<option value='"+ data.first_score.scoretype +"' selected=''> ";
+                    if (data.first_score.scoretype.length>0){
+                        firststye += data.first_score.scoretype ;
+                    }else{
+                        firststye += '请选择最先进球方式';
+                    }
+                    firststye += " </option><option value='射门'>射门</option><option value='头球'>头球</option><option value='无进球'>无进球</option><option value='点球'>点球</option><option value='任意球'>任意球</option><option value='乌龙球'>乌龙球</option>";
+                    $("#firststye").html(firststye);
+
                     lastscore = "<option value='"+data.newapp.last_score+"' selected=''>";
                     if (data.newapp.last_score.length>0){
                         lastscore += data.newapp.last_score;
@@ -411,6 +434,8 @@
         function buttonClick(){
             var matchid = $("#matchid").val();
             var firstscore = $("#firstscore").val();
+            var onescoretime = $("#onescoretime").val();//首进球时间
+            var firststye = $("#firststye").val();
             var lastscore = $("#lastscore").val();
             var matchwiner = $("#matchwiner").val();
             var homeallcard = $("#homeallcard").val();
@@ -422,7 +447,8 @@
             var homehalfcorner = $("#homehalfcorner").val();
             var guesthalfcorner = $("#guesthalfcorner").val();
             var reg = /^[0-99]\d*$/;
-          
+          // alert(firstscore);
+          // alert(firststye);
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
@@ -444,7 +470,7 @@
                             type: 'POST',
                             dataType: 'json',
                             url: '/admin/Sportsfoot/addend',
-                            data: {matchid:matchid,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
+                            data: {matchid:matchid,firstscore:firstscore,onescoretime:onescoretime,firststye:firststye,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
                             success: function(data) {
                                 
                                     layer.msg(data.msg);
@@ -477,14 +503,15 @@
         }
 
         //撤销
-        function revoke(match_id){
+        function revokeft(match_id){
             var match_id = match_id;
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
-                url: '/admin/Sportsfoot/revoke',
+                url: '/admin/Sportsfoot/revokeft',
                 data: {match_id:match_id},
                 success: function(data) {
+                    // alert(data);
                     if(data.status==1){
                         layer.msg(data.msg);
                         location. reload()//刷新当前页面

+ 105 - 0
resources/views/sports/base_champions_league_form.blade.php

@@ -0,0 +1,105 @@
+@extends('vip.layouts')
+@section('content')
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
+        {!! csrf_field() !!}
+        <div class="layui-form-item">
+            <label class="layui-form-label">联赛名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="name_chinese" required  lay-verify="required" placeholder="请输入联赛名称" autocomplete="off" value="{{ isset($name_chinese)?$name_chinese:'' }}" class="layui-input" readonly="readonly">
+            </div>
+        </div>
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">所属地区</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="area_id" id="area" lay-filter="sect">--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($area))--}}
+        {{--@foreach($area as $k=>$v)--}}
+        {{--<option value="{{ $v['id'] }}"  @if(isset($area_id)&&$area_id==$v['id'])  selected @endif>   {{$v['name']}}   </option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">所属国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">联赛状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--@if(isset($status))--}}
+        {{--<input type="radio" name="status" value="-1" title="未启用" @if($status=='-1') checked @endif >--}}
+        {{--<input type="radio" name="status" value="1" title="启用" @if($status=='1') checked @endif>--}}
+        {{--@else--}}
+        {{--<input type="radio" name="status" value="-1" title="未启用" checked >--}}
+        {{--<input type="radio" name="status" value="1" title="启用">--}}
+        {{--@endif--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        @if(isset($odds_code))
+            @foreach($odds_code as $k=>$v)
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{{$v['odds_code']}}</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="{{$v['odds_code']}}" required  lay-verify="required" placeholder="请输入" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+            @endforeach
+        @endif
+
+        @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif
+    </form>
+
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        var id;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                id = data.value;
+                //console.log(id);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/BaseLeague/getcountry',
+                    data:{id:id},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        //console.log(data);
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
+                        $("#country").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+    </script>
+@endsection

+ 105 - 0
resources/views/sports/basket_champions_league_form.blade.php

@@ -0,0 +1,105 @@
+@extends('vip.layouts')
+@section('content')
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
+        {!! csrf_field() !!}
+        <div class="layui-form-item">
+            <label class="layui-form-label">联赛名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="name_chinese" required  lay-verify="required" placeholder="请输入联赛名称" autocomplete="off" value="{{ isset($name_chinese)?$name_chinese:'' }}" class="layui-input" readonly="readonly">
+            </div>
+        </div>
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">所属地区</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="area_id" id="area" lay-filter="sect">--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($area))--}}
+        {{--@foreach($area as $k=>$v)--}}
+        {{--<option value="{{ $v['id'] }}"  @if(isset($area_id)&&$area_id==$v['id'])  selected @endif>   {{$v['name']}}   </option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">所属国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">联赛状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--@if(isset($status))--}}
+        {{--<input type="radio" name="status" value="-1" title="未启用" @if($status=='-1') checked @endif >--}}
+        {{--<input type="radio" name="status" value="1" title="启用" @if($status=='1') checked @endif>--}}
+        {{--@else--}}
+        {{--<input type="radio" name="status" value="-1" title="未启用" checked >--}}
+        {{--<input type="radio" name="status" value="1" title="启用">--}}
+        {{--@endif--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        @if(isset($odds_code))
+            @foreach($odds_code as $k=>$v)
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{{$v['odds_code']}}</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="{{$v['odds_code']}}" required  lay-verify="required" placeholder="请输入" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+            @endforeach
+        @endif
+
+        @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif
+    </form>
+
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        var id;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                id = data.value;
+                //console.log(id);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/BasketLeague/getcountry',
+                    data:{id:id},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        //console.log(data);
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
+                        $("#country").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+    </script>
+@endsection

+ 73 - 0
resources/views/sports/soccer_champions_league_form.blade.php

@@ -0,0 +1,73 @@
+@extends('vip.layouts')
+@section('content')
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
+        {!! csrf_field() !!}
+        <div class="layui-form-item">
+            <label class="layui-form-label">联赛名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="name_chinese" required  lay-verify="required" placeholder="请输入联赛名称" autocomplete="off" value="{{ isset($name_chinese)?$name_chinese:'' }}" class="layui-input" readonly="readonly">
+            </div>
+        </div>
+
+        @if(isset($odds_code))
+            @foreach($odds_code as $k=>$v)
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{{$v['odds_code']}}</label>
+                    <div class="layui-input-inline">
+                        @if(isset($allteam))
+                            @foreach($allteam as $kk=>$aa)
+                                <input name="teammz{{@$k}}{{@$kk}}" id="teammz{{@$k}}{{@$kk}}" lay-verify="" type="checkbox" class="layui-input" value="{{$aa['name_chinese']}}" title="{{$aa['name_chinese']}}">
+                            @endforeach
+                        @endif
+                    </div>
+                </div>
+            @endforeach
+        @endif
+
+        @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif
+    </form>
+
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        var id;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                id = data.value;
+                //console.log(id);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SoccerLeague/getcountry',
+                    data:{id:id},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        //console.log(data);
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
+                        $("#country").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+    </script>
+@endsection

+ 21 - 15
resources/views/sports/soccer_league.blade.php

@@ -40,6 +40,12 @@
         input[type=date]::-webkit-inner-spin-button { visibility: hidden; }
     </style>
 
+    <script type="text/html" id="isresults">
+        <!-- <button onclick="addResult('@{{d.id}}')" class="layui-btn layui-btn-sm layui-btn-green set">修改结果</button> -->
+        <button class="layui-btn layui-btn-sm layui-btn-green set"><a href="/admin/ZqChampionsLeague/edit?id=@{{d.id}}" class="layui-btn layui-btn-sm layui-btn-green set">修改结果</a></button>
+
+    </script>
+
     <script type="text/html" id="recommend">
         @if(checkRriv('/admin/SportsSoccer/recommendmatch'))<input type="checkbox" name="recommend" value="@{{d.id}}" lay-skin="switch" lay-text="推荐|不推荐" lay-filter="openRecommend" @{{ d.recommend == '1' ? 'checked' : '' }}>@endif
     </script>
@@ -63,21 +69,21 @@
                         </div>
                     </div>
 
-                    {{--<div class="layui-inline">--}}
-                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
-                        {{--<div class="layui-input-inline" style="width: 150px">--}}
-                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
-                                {{--<option value="-1"></option>--}}
-                                {{--@foreach($league as $k=>$v):--}}
-                                {{--@if($name_chinese==$v['name_chinese']))--}}
-                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
-                                {{--@else--}}
-                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
-                                {{--@endif--}}
-                                {{--@endforeach--}}
-                            {{--</select>--}}
-                        {{--</div>--}}
-                    {{--</div>--}}
+                    <!-- <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline" style="width: 150px">
+                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($league as $k=>$v):
+                                @if($name_chinese==$v['name_chinese']))
+                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                                @else
+                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div> -->
 
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.area_search') }}</label>

+ 277 - 1
resources/views/sports/sports_notelist.blade.php

@@ -67,6 +67,116 @@
         }
     </style>
 
+    <style type="text/css">
+    /* 弹窗 (background) */
+    .modal {
+        display: none; /* 默认隐藏 */
+        /*生成绝对定位的元素,相对于浏览器窗口进行定位。*/
+        position: fixed; 
+        z-index: 1; 
+        left: 0;
+        top: 0;
+        /*设置弹窗位置*/
+        padding-top: 100px;
+        padding-bottom: 200px;
+        /*浮在全屏上*/
+        width: 100%; 
+        height:  100%; 
+        /*overflow:auto;如果内容被修剪,则浏览器会显示滚动条,以便查看其余内容。*/
+        overflow: auto; 
+        background-color: rgb(0,0,0); 
+        background-color: rgba(0,0,0,0.4);
+        text-align: right;
+    }
+
+    /* 弹窗内容 */
+    .modal-content {
+        /*position: relative;*/
+        /*弹窗背景色设置*/
+        background-color: #fefefe;
+        margin: auto;
+        padding: 260px auto;
+        width: 600px;
+        box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
+        -webkit-animation-name: animatetop;
+        -webkit-animation-duration: 0.4s;
+        animation-name: animatetop;
+        animation-duration: 0.4s;
+        border-radius: 10px;
+       }
+
+    /* 添加动画 */
+    @-webkit-keyframes animatetop {
+        from {top:-200px; opacity:0} 
+        to {top:0; opacity:1}
+    }
+
+    @keyframes animatetop {
+        from {top:-200px; opacity:0}
+        to {top:0; opacity:1}
+    }
+
+    /* 关闭按钮 */
+    .close {
+        color: white;
+        float: right;
+        font-size: 28px;
+        font-weight: bold;
+    }
+
+    .close:hover, .close:focus {
+        color: #000;
+        text-decoration: none;
+        cursor: pointer;
+    }
+
+    .modal-header {
+        display: block;
+        line-height: 30px;
+        padding: 2px 10px;
+        background-color: #AEAEAE;
+        color: white;
+        text-align: left;
+        border-radius: 5px 5px 0 0;
+    }
+
+    .modal-body {
+        padding: 2px 16px;
+        font-size: 18px;
+        /*height: 200px;*/
+    }
+
+    .modal-footer {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        width: 520px;
+        padding: 0 40px;
+        height: 50px;
+       border-radius:0 0 5px 5px;
+        display: block;
+        line-height: 39px;
+        background-color: #AEAEAE;
+        color: white;
+    }
+    .ok,.no{
+        width: 100px;
+        height: 40px;
+    }
+</style>
+
+
+    <script type="text/html" id="game_status">
+        <button onclick="addResult('@{{d.id}}','{{$type}}')" class="layui-btn layui-btn-sm layui-btn-green set">修改结果</button>
+
+        @{{#if(d.settle_status==1){ }} 
+            <span>未结算</span>
+        @{{#} }}<br>
+        @{{#if(d.settle_status==2){ }}
+            <span>已结算</span>
+        @{{#} }}
+    </script>
+
     <script type="text/html" id="status">
         @if(checkRriv('/admin/SportsSoccer/score'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
     </script>
@@ -179,7 +289,64 @@
             </form>
         </div>
     </div>
-    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+
+    <!-- 弹窗隐藏区域 -->
+    <div id="myModal" class="modal">
+            <input type="hidden" id="did" name="did" value="">
+            <input type="hidden" id="qlgame" name="qlgame" value="">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <span class="close">&times;</span>
+                    <h2>赛事结果添加</h2>
+                </div>
+                <div class="modal-body">
+                    <p style="text-align:left;color:#5f7788;">请认真填写赛事结果,将会按照改结果结算</p><br>
+                    <div style="text-align:left;">
+                        <div style="display: flex;">
+                            <li>最先进球球队:</li>
+                            <select name="firstscore" id="firstscore">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li>最后进球球队:</li>
+                            <select name="lastscore" id="lastscore">
+                            </select>
+                        </div>
+                        <div style="display: flex;">
+                            <li> 获 &nbsp;胜&nbsp; 球&nbsp; 队&nbsp;:</li><input type="text" id="matchwiner" name="matchwiner" value="">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队全场角球:</li><input type="text" id="homeallcorner" name="homeallcorner" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;"> 
+                            <li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;">
+                            <li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="" autocomplete="off">
+                        </div>
+                        <div style="display: flex;">
+                            <li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="" autocomplete="off">
+                        </div> 
+                        <div style="display: flex;">
+                            <li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="" autocomplete="off">
+                        </div><br>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="ok" onchange="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="no"><h3>取消</h3></button>
+                </div>
+            </div>
+    </div>
+
     <script>
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
@@ -196,6 +363,115 @@
                 }
             })
         })
+
+        function addResult($id,$qlgame){
+            $(":input",$("#myModal")).each(function(i){  $(this).val('');});
+            var did = $id;
+            var qlgame = $qlgame;
+            document.getElementById("did").value=$id;//赋值个弹窗
+            document.getElementById("qlgame").value=$qlgame;//赋值个弹窗
+            // alert($qlgame);
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/SoccerNoteList/Sairesult',
+                data: {did:did,qlgame:qlgame},
+                success: function(data) {
+                    // alert(data.singleresult[0].match_winer);
+                    document.getElementById("matchwiner").value=data.singleresult[0].match_winer;
+                    document.getElementById("homeallcard").value=data.singleresult[0].penaltycard.home;
+                    document.getElementById("guestallcard").value=data.singleresult[0].penaltycard.guest;
+                    document.getElementById("homehalfcard").value=data.singleresult[0].penaltycard.home_half;
+                    document.getElementById("guesthalfcard").value=data.singleresult[0].penaltycard.guest_half;
+                    document.getElementById("homeallcorner").value=data.singleresult[0].cornerball.home;
+                    document.getElementById("guestallcorner").value=data.singleresult[0].cornerball.guest;
+                    document.getElementById("homehalfcorner").value=data.singleresult[0].cornerball.home_half;
+                    document.getElementById("guesthalfcorner").value=data.singleresult[0].cornerball.guest_half;
+
+                    firstscore = "<option value='"+ data.singleresult[0].first_score +"' selected=''> ";
+                    if (data.singleresult[0].first_score.length>0){
+                        firstscore += data.singleresult[0].first_score ;
+                    }else{
+                        firstscore += '请选择最先进球';
+                    }
+                    firstscore += " </option><option value=" +data.teamname.home_team + ">" + data.teamname.home_team + "</option><option value=" +data.teamname.guest_team + ">" + data.teamname.guest_team + "</option>";
+                    $("#firstscore").html(firstscore);
+
+                    lastscore = "<option value='"+data.singleresult[0].last_score+"' selected=''>";
+                    if (data.singleresult[0].last_score.length>0){
+                        lastscore += data.singleresult[0].last_score;
+                    }else{
+                        lastscore += '请选择最后进球';
+                    }
+                    lastscore += "</option><option value=" + data.teamname.home_team + ">" + data.teamname.home_team + "</option><option value=" + data.teamname.guest_team + ">" + data.teamname.guest_team + "</option>";
+                    $("#lastscore").html(lastscore);
+                }
+            }) 
+
+
+            //获取弹窗得div
+            var modal = document.getElementById('myModal');
+            // 获取 <span> 元素,用于关闭弹窗 (X)
+            var span = document.getElementsByClassName("close")[0];
+            //获取弹窗中得确定按钮
+            var ok=document.getElementsByClassName("ok")[0];
+            //获取弹窗中得取消按钮
+            var no=document.getElementsByClassName("no")[0];
+            //窗体弹出
+            modal.style.display = "block";
+            //点击窗体ok
+            ok.onclick=function(){
+                //执行弹出窗体得确定后得操作
+                alert("执行确定按钮点击得操作");
+                //关闭窗口
+                modal.style.display = "none";
+                buttonClick();
+            }
+            //点击窗体取消按钮
+            no.onclick=function(){
+                //直接关闭窗口
+                modal.style.display = "none";
+            }
+            // 点击 <span> (x), 关闭弹窗
+            span.onclick = function() {
+                //直接关闭窗口
+                modal.style.display = "none";
+            }
+            // 在用户点击其他地方时,关闭弹窗
+            window.onclick = function(event) {
+                //点击窗口外内容,关闭窗口
+                if (event.target == modal) modal.style.display = "none";
+            }
+        }
+
+        function buttonClick(){
+            var did = $("#did").val();
+            var firstscore = $("#firstscore").val();
+            var lastscore = $("#lastscore").val();
+            var matchwiner = $("#matchwiner").val();
+            var homeallcard = $("#homeallcard").val();
+            var guestallcard = $("#guestallcard").val();
+            var homehalfcard = $("#homehalfcard").val();
+            var guesthalfcard = $("#guesthalfcard").val();
+            var homeallcorner = $("#homeallcorner").val();
+            var guestallcorner = $("#guestallcorner").val();
+            var homehalfcorner = $("#homehalfcorner").val();
+            var guesthalfcorner = $("#guesthalfcorner").val();
+          
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/SoccerNoteList/addend',
+                data: {did:did,firstscore:firstscore,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner},
+                success: function(data) {
+                    layer.msg(data.msg);
+                    location. reload()//刷新当前页面
+                }
+            })
+            
+        }
+
+
     </script>
     @push('dataTableJS')
         /*var active = {

+ 457 - 0
resources/views/sports/sports_search.blade.php

@@ -0,0 +1,457 @@
+@extends('vip.layouts')
+@section('seo_title')
+    足球单式注单管理
+@endsection
+@section('content')
+    <style>
+        .layui-laydate-range {
+            width: auto;
+        }
+
+        .layui-form-switch em {
+            width: auto;
+        }
+        .layui-form-switch {
+            width: 44px;
+            line-height: 23px;
+        }
+        .layui-form-item .checkbox {
+            width: auto;
+        }
+        .red{
+            color: red;
+        }
+        .blue{
+            color: #1E9FFF;
+        }
+        .green{
+            color: green;
+        }
+        .yellow{
+            color: #ffca10;
+        }
+
+        .red{
+            color: red;
+        }
+        .blue{
+            color: #1E9FFF;
+        }
+        .green{
+            color: green;
+        }
+        .yellow{
+            color: #ffca10;
+        }
+        .bottom-txt{
+            padding: 0.5em;
+            line-height: 2em;
+        }
+        table{
+            text-align: center;
+        }
+        th div{
+            text-align: center;
+        }
+        tbody span{
+            color: red;
+        }
+        .resettlement{
+            background-color: #FF5722;
+        }
+        .settlement{
+            background-color: #FF5722;
+        }
+        .invalid{
+            background-color: #FF5722;
+        }
+    </style>
+
+    <style type="text/css">
+    /* 弹窗 (background) */
+    .modal {
+        display: none; /* 默认隐藏 */
+        /*生成绝对定位的元素,相对于浏览器窗口进行定位。*/
+        position: fixed; 
+        z-index: 1; 
+        left: 0;
+        top: 0;
+        /*设置弹窗位置*/
+        padding-top: 100px;
+        padding-bottom: 200px;
+        /*浮在全屏上*/
+        width: 100%; 
+        height:  100%; 
+        /*overflow:auto;如果内容被修剪,则浏览器会显示滚动条,以便查看其余内容。*/
+        overflow: auto; 
+        background-color: rgb(0,0,0); 
+        background-color: rgba(0,0,0,0.4);
+        text-align: right;
+    }
+
+    /* 弹窗内容 */
+    .modal-content {
+        /*position: relative;*/
+        /*弹窗背景色设置*/
+        background-color: #fefefe;
+        margin: auto;
+        padding: 260px auto;
+        width: 600px;
+        box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
+        -webkit-animation-name: animatetop;
+        -webkit-animation-duration: 0.4s;
+        animation-name: animatetop;
+        animation-duration: 0.4s;
+        border-radius: 10px;
+       }
+
+    /* 添加动画 */
+    @-webkit-keyframes animatetop {
+        from {top:-200px; opacity:0} 
+        to {top:0; opacity:1}
+    }
+
+    @keyframes animatetop {
+        from {top:-200px; opacity:0}
+        to {top:0; opacity:1}
+    }
+
+    /* 关闭按钮 */
+    .close {
+        color: white;
+        float: right;
+        font-size: 28px;
+        font-weight: bold;
+    }
+
+    .close:hover, .close:focus {
+        color: #000;
+        text-decoration: none;
+        cursor: pointer;
+    }
+
+    .modal-header {
+        display: block;
+        line-height: 30px;
+        padding: 2px 10px;
+        background-color: #AEAEAE;
+        color: white;
+        text-align: left;
+        border-radius: 5px 5px 0 0;
+    }
+
+    .modal-body {
+        padding: 2px 16px;
+        font-size: 18px;
+        /*height: 200px;*/
+    }
+
+    .modal-footer {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        width: 520px;
+        padding: 0 40px;
+        height: 50px;
+       border-radius:0 0 5px 5px;
+        display: block;
+        line-height: 39px;
+        background-color: #AEAEAE;
+        color: white;
+    }
+    .ok,.no{
+        width: 100px;
+        height: 40px;
+    }
+</style>
+
+    <script type="text/html" id="status">
+        @if(checkRriv('/admin/SportsSoccer/score'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
+    </script>
+
+    <div class="layui-row">
+        <div class="layui-col-xs12">
+            <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
+                <div class="layui-form-item">
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.notelist_type') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <select name="type"  id="form_type"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.notelist_type.type') as $k=>$v):
+                                @if($type==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.account') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <input type="text" name="account" id="account" eventType="event-query"  value="{{ $account }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
+                        <div class="layui-input-inline checkbox">
+                        <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
+                        <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.date') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>~
+                    <div class="layui-inline">
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
+                        <div class="layui-input-inline" style="">
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.order_id') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <input type="text" name="order_id" id="order_id" eventType="event-query"  value="{{ $order_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.ifsettlement') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.ifsettlement.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.order_status') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <select name="order_status"  id="form_order_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.order_status.status') as $k=>$v):
+                                @if($order_status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
+                        <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
+                        {{--@if(checkRriv('/admin/SoccerNoteList/batchsettlement'))<a href="javascript:batchsettlement('/admin/SoccerNoteList/batchsettlement');" class="layui-btn layui-btn-sm  layui-btn-danger">批量结算</a>@endif--}}
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        {{--@if(checkRriv('/admin/SportsSoccer/add'))<a href="/admin/SportsSoccer/add" class="layui-btn layui-btn-sm ">添加</a>@endif--}}
+                        {{--@if(checkRriv('/admin/SoccerNoteList/orderstatus'))<a href="/admin/SoccerNoteList/orderstatus" class="layui-btn layui-btn-sm ">订单状态审核</a>@endif--}}
+                        @if(checkRriv('/admin/SoccerNoteList/delete'))<a href="javascript:delWin('/admin/SoccerNoteList/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                    </div>
+
+                    <!-- &nbsp;&nbsp;&nbsp;&nbsp;<div class="layui-inline"><a href="javascript:openWin('/admin/user/infoAdd','{{ trans('menu.menu_add') }}','700px','500px')" class="layui-btn layui-btn-sm  ">添加</a></div>
+                    <div class="layui-inline"><a href="/admin/menu/add" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div> -->
+
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <script>
+        $(function () {
+            $('body').on('click', 'a[eventtype="event-delete"]', function () {
+                var span = $(this).prev();
+                var id = span.attr('data-id');
+                // openWin('/admin/system/AddMenu','{{ trans("menu.menu_edit")}}','600px','500px',id);
+            })
+            $('body').on('click','#form_sureblur~.layui-form-switch',function(){
+                var sus = $('#form_sureblur').next().text();
+                if(sus=='精确'){
+                    $('#form_sureblurs').val('on');
+                }else{
+                    $('#form_sureblurs').val('off');
+                }
+            })
+        })
+
+    </script>
+    @push('dataTableJS')
+        /*var active = {
+            reload: function(){
+                //执行重载
+                console.log($('#form_status').val());
+                table.reload('{{ $dataId }}', {
+                    page: {
+                        curr: 1 //重新从第 1 页开始
+                    }
+                    ,where: {
+                        account_name:$("#form_account_name").val(),
+                        order_id:$('#form_order_id').val(),
+                        bank_user:$('#form_bank_user').val(),
+                        money_small:$('#form_money_small').val(),
+                        money_big:$('#form_money_big').val(),
+                        status:$('#form_status').val(),
+                        apply_startime:$('#form_apply_startime').val(),
+                        apply_endtime:$('#form_apply_endtime').val(),
+                        haddle_startime:$('#form_haddle_startime').val(),
+                        haddle_endtime:$('#form_haddle_endtime').val(),
+                        sureblur:$('.layui-form-switch').text(),
+                    }
+                });
+            }
+        };*/
+    //$('.lay-btn-diy').on('click', function(){
+    //	var type = $(this).data('type');
+    //	active[type] ? active[type].call(this) : '';
+    //});
+
+    //重置表单
+    $('.reset').on('click',function(){
+    $('input').val('');
+    $('#form_status').val('3');
+    $('.layui-form-select input').val('待审核');
+    //var type = $(this).data('type');
+    //active[type] ? active[type].call(this) : '';
+    });
+
+    //刷新表单
+    $('.set').on('click',function(){
+    //var type = $(this).data('type');
+    //active[type] ? active[type].call(this) : '';
+    });
+
+
+    function dataTableLoadFinished(res,curr,count){
+    var str='';
+    //console.log(res);
+    if(document.getElementById("statistics")){
+
+    }else{
+    $('.layui-table-page').after('<div id="statistics"></div>');
+    }
+    $.ajax({
+    type: 'get',
+    url: '/admin/SoccerNoteList/moneycount',
+    data: {where:res.extras},
+    dataType: 'json',
+    //async: false,
+    success: function (data) {
+    var data=data.data;
+    for(var i in data){
+    data[i]=parseFloat(data[i]);
+    }
+    str+='<p class="bottom-txt">总投注金额:<span class="blue">'+data.all_money+'</span> , 总可赢金额:<span class="red">'+data.all_prize_money+'</span> , 已赢金额:<span class="green">'+data.alraedy_prize_money+'</span></p>'
+    {{--str+='<p class="bottom-txt">总金额:<span class="blue">'+data.all_money+'</span> , 成功:<span class="green">'+data.success_money+'</span> , 手续费:<span class="red">'+data.service_money+'</span> , 处理中:<span class="yellow">'+data.handing+'</span></p>'--}}
+    $('#statistics').html(str);
+    var height1=$('.layui-table-view').height();
+    var height2=$('#statistics').height();
+
+    $('.layui-table-view').css({height:(height1+height2)});
+    }
+    });
+
+
+    }
+    @endpush
+    <script type="text/javascript">
+        //批量结算
+        function batchsettlement(url) {
+            layer.confirm('是否确认批量结算?', {
+                btn: ['确认', '取消'] //按钮
+            }, function() {
+                $.getJSON(url, function(data, textStatus) {
+                    if (data.status == '1') {
+                        reloadDataTable();
+                        layer.msg('批量结算成功');
+                    } else {
+                        layer.msg(data.msg);
+                    }
+                });
+            }, function() {
+
+            });
+
+        }
+        //单式注单结算
+        function settlement(url,ids) {
+            layer.confirm('是否确认结算?', {
+                btn: ['确认', '取消'] //按钮
+            }, function() {
+                $.getJSON(url, function(data, textStatus) {
+                    //console.log(data);
+                    if (data.status == '1') {
+                        reloadDataTable();
+                        layer.msg('结算成功');
+                    } else {
+                        layer.msg(data.msg);
+                    }
+                });
+            }, function() {
+
+            });
+
+        }
+        //重新结算
+        function resettlement(url) {
+            layer.confirm('是否确认重新结算?', {
+                btn: ['确认', '取消'] //按钮
+            }, function() {
+                $.getJSON(url, function(data, textStatus) {
+                    //console.log(data);
+                    if (data.status == '1') {
+                        reloadDataTable();
+                        layer.msg('重新结算成功');
+                    } else {
+                        layer.msg(data.msg);
+                    }
+                });
+            }, function() {
+
+            });
+
+        }
+
+        //单式注单作废
+        function invalid(url,ids) {
+            layer.confirm('是否确认作废?', {
+                btn: ['确认', '取消'] //按钮
+            }, function() {
+                $.getJSON(url, function(data, textStatus) {
+                    //console.log(data);
+                    if (data == '1') {
+                        reloadDataTable();
+                        layer.msg('作废成功');
+                    } else {
+                        layer.msg(data.msg);
+                    }
+                });
+            }, function() {
+
+            });
+
+        }
+    </script>
+
+    @include('vip.datatable')
+@endsection

+ 105 - 0
resources/views/sports/tennis_champions_league_form.blade.php

@@ -0,0 +1,105 @@
+@extends('vip.layouts')
+@section('content')
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
+        {!! csrf_field() !!}
+        <div class="layui-form-item">
+            <label class="layui-form-label">联赛名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="name_chinese" required  lay-verify="required" placeholder="请输入联赛名称" autocomplete="off" value="{{ isset($name_chinese)?$name_chinese:'' }}" class="layui-input" readonly="readonly">
+            </div>
+        </div>
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">所属地区</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="area_id" id="area" lay-filter="sect">--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($area))--}}
+        {{--@foreach($area as $k=>$v)--}}
+        {{--<option value="{{ $v['id'] }}"  @if(isset($area_id)&&$area_id==$v['id'])  selected @endif>   {{$v['name']}}   </option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">所属国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">联赛状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--@if(isset($status))--}}
+        {{--<input type="radio" name="status" value="-1" title="未启用" @if($status=='-1') checked @endif >--}}
+        {{--<input type="radio" name="status" value="1" title="启用" @if($status=='1') checked @endif>--}}
+        {{--@else--}}
+        {{--<input type="radio" name="status" value="-1" title="未启用" checked >--}}
+        {{--<input type="radio" name="status" value="1" title="启用">--}}
+        {{--@endif--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        @if(isset($odds_code))
+            @foreach($odds_code as $k=>$v)
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{{$v['odds_code']}}</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="{{$v['odds_code']}}" required  lay-verify="required" placeholder="请输入" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+            @endforeach
+        @endif
+
+        @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif
+    </form>
+
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        var id;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                id = data.value;
+                //console.log(id);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/TennisLeague/getcountry',
+                    data:{id:id},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        //console.log(data);
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
+                        $("#country").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+    </script>
+@endsection

+ 0 - 41
routes/api.php

@@ -46,47 +46,6 @@ $routes=array(
     'upMatch'=>exeApi('api', 'WriteSports','upMatch'),
 );
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 function exeApi($m, $c, $act)
 {
     return array('m' => $m, 'c' => $c, 'act' => $act);

+ 28 - 0
routes/web.php

@@ -24,6 +24,10 @@ Route::get('/', function () {
  Route::get('api/Settlement/index', function () {
      return appExec('api', 'Settlement', 'index');
  });
+//python 登录 获取 token
+Route::post('/getToken', function () {
+    return appExec('api', 'WriteSports', 'getToken');
+});
 //写入赛事数据接口
 Route::post('/setSports', function () {
     return appExec('api', 'WriteSports', 'setSports');
@@ -32,6 +36,30 @@ Route::post('/setSports', function () {
 Route::post('/upMatch', function () {
     return appExec('api', 'WriteSports', 'upMatch');
 });
+//写入赔率数据
+Route::post('/setOdds', function () {
+    return appExec('api', 'WriteSports', 'setOdds');
+});
+//写入 冠军联赛赔率数据
+Route::post('/setOddsCH', function () {
+    return appExec('api', 'WriteSports', 'setOddsCH');
+});
+//写入联赛数据
+Route::post('/setLeague', function () {
+    return appExec('api', 'WriteSports', 'setLeague');
+});
+//写入赛事数据
+Route::post('/setMatch', function () {
+    return appExec('api', 'WriteSports', 'setMatch');
+});
+//写入赛事结果记录数据
+Route::post('/setMatchResult', function () {
+    return appExec('api', 'WriteSports', 'setMatchResult');
+});
+//写入赛事直播数据
+Route::post('/setBroadCast', function () {
+    return appExec('api', 'WriteSports', 'setBroadCast');
+});
 
 
 /**

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov