追加推送 5/17

app/Http/Controllers/Admin/SportsBaseController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request as Req;
 use Illuminate\Support\Facades\DB;
+Use App\Lib\Settlement\SettlementWinFail;
 use App\Models;
 use Request;
 
@@ -34,7 +35,8 @@ class SportsBaseController extends Controller {
         $dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('recommend', array('templet' => '#recommend', 'sort' => false, 'width' => 120,'align' => 'center'));
-        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('result', array( 'sort' => false, 'width' => 100));
         //$arr[] = 'view';
         if (checkRriv('/admin/SportsBase/edit')) {
             $arr[] = 'edit';
@@ -267,6 +269,21 @@ class SportsBaseController extends Controller {
 
     }
 
+    /**
+     *赛事结果处理
+     */
+    public function dealwith(Req $req)
+    {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        //return $id;
+        $SettlementWinFail = new SettlementWinFail();
+        $data = $SettlementWinFail->doRun($id);
+        return $data;
+    }
+
     function odds(Req $req)
     {
         $cp_id = $req->id;

app/Http/Controllers/Admin/SportsBasketController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request as Req;
 use Illuminate\Support\Facades\DB;
+Use App\Lib\Settlement\SettlementWinFail;
 use App\Models;
 use Request;
 
@@ -34,7 +35,8 @@ class SportsBasketController extends Controller {
 		$dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
 		$dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
 		$dt->addColsFields('recommend', array('templet' => '#recommend', 'sort' => false, 'width' => 120,'align' => 'center'));
-		$dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+		$dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+		$dt->addColsFields('result', array( 'sort' => false, 'width' => 100));
 		//$arr[] = 'view';
 		if (checkRriv('/admin/SportsBasket/edit')) {
 			$arr[] = 'edit';
@@ -330,6 +332,21 @@ class SportsBasketController extends Controller {
 
 	}
 
+	/**
+	 *赛事结果处理
+	 */
+	public function dealwith(Req $req)
+	{
+		$id = $req->id;
+		if (intval($id) < 1) {
+			return -1;
+		}
+		//return $id;
+		$SettlementWinFail = new SettlementWinFail();
+		$data = $SettlementWinFail->doRun($id);
+		return $data;
+	}
+
 	function odds(Req $req)
 	{
 		$cp_id = $req->id;

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request as Req;
 use Illuminate\Support\Facades\DB;
+Use App\Lib\Settlement\SettlementWinFail;
 use App\Models;
 use Request;
 
@@ -34,7 +35,8 @@ class SportsSoccerController extends Controller {
         $dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('recommend', array('templet' => '#recommend', 'sort' => false, 'width' => 120,'align' => 'center'));
-        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('result', array( 'sort' => false, 'width' => 100));
         //$arr[] = 'view';
         if (checkRriv('/admin/SportsSoccer/edit')) {
             $arr[] = 'edit';
@@ -331,6 +333,21 @@ class SportsSoccerController extends Controller {
 
     }
 
+    /**
+     *赛事结果处理
+     */
+    public function dealwith(Req $req)
+    {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        //return $id;
+        $SettlementWinFail = new SettlementWinFail();
+        $data = $SettlementWinFail->doRun($id);
+        return $data;
+    }
+
     function odds(Req $req)
     {
         $cp_id = $req->id;
@@ -345,7 +362,8 @@ class SportsSoccerController extends Controller {
             $match_id = $newapp->match_id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
-        $data = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
+        //$data = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
+        $data = \App\Models\Matchcode::where('p_id','0')->get();
         $request['pcode'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsSoccer/oddsinfo?match_id='.$match_id.'');
@@ -415,7 +433,8 @@ class SportsSoccerController extends Controller {
      *添加赔率
      */
     function addodds(Req $req) {
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
+        //$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -487,7 +506,9 @@ class SportsSoccerController extends Controller {
      *修改赔率
      */
     function oddsedit(Req $req) {
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
+        $lange = trans('sportsoddscode');
+        //$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -501,21 +522,39 @@ class SportsSoccerController extends Controller {
             if (!$data) {
                 return -2;
             }
-            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','zq')->first();
-            $data->odds_name = $res->odds_name;
+            //$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','zq')->first();
+            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->first();
+            if(!empty($res)){
+                $data->odds_name = $res->odds_name;
+            }
+//            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->first();
+//            if(!empty($res)){
+//                $data->odds_code = $res->odds_name;
+//            }
+//            $res1 = \App\Models\Matchcode::where('odds_code', $data->p_code)->first();
+//            if(!empty($res)){
+//                $data->p_code = $res1->odds_name;
+//            }
+
 
             $expire_time = $data->expire_time; //2019-04-15 21:10:00
             $str1 = str_replace(" ","T",$expire_time);
             $data->expire_time = $str1;
 
-            $odds_code = trim($data->odds_code);
-            $p_code = trim($data->p_code);
-            if (isset($lange[$odds_code])) {
-                $data->odds_code_cn=$lange[$odds_code];
-            }
-            if (isset($lange[$p_code])) {
-                $data->p_code_cn=$lange[$p_code];
-            }
+//            $odds_code = trim($data->odds_code);
+//            $p_code = trim($data->p_code);
+//            if (isset($lange[$odds_code])) {
+//                $data->odds_code_cn=$lange[$odds_code];
+//            }
+//            if (isset($lange[$p_code])) {
+//                $data->p_code_cn=$lange[$p_code];
+//            }
+//            if (isset($lange[$odds_code])) {
+//                $data->odds_code=$lange[$odds_code];
+//            }
+//            if (isset($lange[$p_code])) {
+//                $data->p_code=$lange[$p_code];
+//            }
             $data = $data->toArray();
 
             $data['pcode'] = $pcodedata;
@@ -527,9 +566,9 @@ class SportsSoccerController extends Controller {
             $data = new \App\Models\SoccerOddsRecord();
             $model->id = $req->input('id');
             $model = $model::find($model->id);
-            $model->odds_code = $req->input('code');
+            //$model->odds_code = $req->input('code');
             $model->status = $req->input('status');
-            $model->p_code = $req->input('pcode');
+            //$model->p_code = $req->input('pcode');
             $model->odds = $req->input('odds');
             $model->condition = $req->input('condition');
             $model->max = $req->input('max');
@@ -541,11 +580,11 @@ class SportsSoccerController extends Controller {
 
             $result = \App\Models\SoccerOdds::where('id',$model->id)->first();
             $data->match_id = $result->match_id;
-            $data->odds_code = $model->odds_code;
+            //$data->odds_code = $model->odds_code;
             $data->status = $model->status;
-            $data->p_code = $model->p_code;
-            $data->p_id = $model->p_id;
-            $record = \App\Models\SoccerOddsRecord::where('match_id',$data->match_id)->where('odds_code',$data->odds_code)->where('p_id',$data->p_id)->orderby('utime','desc')->first();
+            //$data->p_code = $model->p_code;
+            $data->p_id = $result->p_id;
+            $record = \App\Models\SoccerOddsRecord::where('match_id',$data->match_id)->where('odds_code',$result->odds_code)->where('p_id',$result->p_id)->orderby('utime','desc')->first();
             if(!empty($record)){
                 $sort = $record->sort;
                 $data->sort = $sort+1;

app/Http/Controllers/Admin/SportsTennisController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request as Req;
 use Illuminate\Support\Facades\DB;
+Use App\Lib\Settlement\SettlementWinFail;
 use App\Models;
 use Request;
 
@@ -34,7 +35,8 @@ class SportsTennisController extends Controller {
         $dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
         $dt->addColsFields('recommend', array('templet' => '#recommend', 'sort' => false, 'width' => 120,'align' => 'center'));
-        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('result', array( 'sort' => false, 'width' => 100));
         //$arr[] = 'view';
         if (checkRriv('/admin/SportsTennis/edit')) {
             $arr[] = 'edit';
@@ -267,6 +269,21 @@ class SportsTennisController extends Controller {
 
     }
 
+    /**
+     *赛事结果处理
+     */
+    public function dealwith(Req $req)
+    {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        //return $id;
+        $SettlementWinFail = new SettlementWinFail();
+        $data = $SettlementWinFail->doRun($id);
+        return $data;
+    }
+
     function odds(Req $req)
     {
         $cp_id = $req->id;

app/Lib/Settlement/SettlementOrder.php

@@ -100,8 +100,8 @@ class SettlementOrder extends SettlementBase
         foreach ($matchData as $k => $v) {
             $oddsResult[0]['winOrLose'] = $v -> result;
             $oddsResult[0]['odds'] = $v -> odds;
-            $getReturnMoney = $settlementBase -> winOddsCalculation($oddsResult);
-            $returnMoney += ($getReturnMoney['returnMoney'] + 1) * $v -> bet_money;
+            $getReturnMoney = $settlementBase -> stringOdds($oddsResult);
+            $returnMoney += $getReturnMoney['returnMoney'] * $v -> bet_money;
         }
         $returnMoney = sprintf("%.2f",substr(sprintf("%.3f", $returnMoney), 0, -1));
         // 判断盈亏  1 赢  2 输  3 平

app/Lib/Settlement/SettlementWinFail.php

@@ -45,11 +45,11 @@ class SettlementWinFail
 
 
     //按赛事批量结算
-    public function   doRun(){
+    public function   doRun($id=0){
 
         try {
 
-            $ComendNoticModel = $this->getComendNoticeModel();
+            $ComendNoticModel = $this->getComendNoticeModel($id);
             if (!$ComendNoticModel) {
                 return  $this->makeData(1,'没有要处理的数据,直接退出');
             }
@@ -250,8 +250,13 @@ class SettlementWinFail
 
 
     //是否有需要进行结果算处理的赛事记录
-    public  function   getComendNoticeModel(){
-            $ret = (new ComendnoticeModel())->where('status',0)->orderby('id','asc')->first();
+    public  function   getComendNoticeModel($id=0){
+            if ($id){
+                $ret = (new ComendnoticeModel())->where(['id'=>$id,'status'=>0])->orderby('id','asc')->first();
+            }else{
+                $ret = (new ComendnoticeModel())->where('status',0)->orderby('id','asc')->first();
+            }
+
 
             $this->ComendNoticModel = $ret;
             return $ret;

app/Models/SportsBase.php

@@ -63,6 +63,16 @@ class SportsBase extends BaseModel {
             }else{
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
+            $result = DB::table('comendnotice')->where('match_id',$data[$i]->match_id)->where('game_code','bq')->first();
+            if(!empty($result)){
+                if($result->status == '0'){
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsBase/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsBase/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
+                }else{
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
+                }
+            }else{
+                $data[$i]->result = '<a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 处理 </a>';
+            }
         }
         return $data->toArray();
 

app/Models/SportsBasket.php

@@ -63,6 +63,16 @@ class SportsBasket extends BaseModel {
             }else{
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
+            $result = DB::table('comendnotice')->where('match_id',$data[$i]->match_id)->where('game_code','lq')->first();
+            if(!empty($result)){
+                if($result->status == '0'){
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsBasket/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsBasket/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
+                }else{
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
+                }
+            }else{
+                $data[$i]->result = '<a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 处理 </a>';
+            }
         }
         return $data->toArray();
 

app/Models/SportsSoccer.php

@@ -63,6 +63,16 @@ class SportsSoccer extends BaseModel {
             }else{
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
+            $result = DB::table('comendnotice')->where('match_id',$data[$i]->match_id)->where('game_code','zq')->first();
+            if(!empty($result)){
+                if($result->status == '0'){
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsSoccer/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsSoccer/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
+                }else{
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
+                }
+            }else{
+                $data[$i]->result = '<a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 处理 </a>';
+            }
 
         }
         return $data->toArray();

app/Models/SportsTennis.php

@@ -63,6 +63,16 @@ class SportsTennis extends BaseModel {
             }else{
                 $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             }
+            $result = DB::table('comendnotice')->where('match_id',$data[$i]->match_id)->where('game_code','wq')->first();
+            if(!empty($result)){
+                if($result->status == '0'){
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="/admin/SportsTennis/dealwith/?id=" href="javascript:dealwith(\'/admin/SportsTennis/dealwith/?id='.$result->id.'\');" style="background-color: #FF5722;"> 处理 </a>';
+                }else{
+                    $data[$i]->result = '<a class="layui-btn layui-btn-sm dealwith" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已处理 </a>';
+                }
+            }else{
+                $data[$i]->result = '<a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 处理 </a>';
+            }
         }
         return $data->toArray();
 

resources/lang/zh-cn/sportsbase.php

@@ -10,6 +10,7 @@ return array(
     'match_date' => '赛事日期',
     'match_time' => '赛事时间',
     'status' => '赛事状态',
+    'result' => '结果状态',
     'recommend' => '是否推荐',
     'match_score' => '赛事比分',
     'search' => '搜索',

resources/lang/zh-cn/sportstennis.php

@@ -10,6 +10,7 @@ return array(
     'match_date' => '赛事日期',
     'match_time' => '赛事时间',
     'status' => '赛事状态',
+    'result' => '结果状态',
     'recommend' => '是否推荐',
     'match_score' => '赛事比分',
     'search' => '搜索',

resources/views/sports/base_match.blade.php

@@ -198,6 +198,27 @@
     //    });
 
     @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')
 @endsection

resources/views/sports/basket_match.blade.php

@@ -204,6 +204,27 @@
     //    });
 
     @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')
 @endsection

resources/views/sports/soccer_match.blade.php

@@ -198,6 +198,26 @@
     //    });
 
     @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')
 @endsection

resources/views/sports/soccer_odds_form.blade.php

@@ -8,6 +8,18 @@
                 <input type="text" name="match_id" required  lay-verify="id" autocomplete="off" value="{{ isset($match_id)?$match_id:'' }}" class="layui-input" readonly="readonly">
             </div>
         </div>
+        {{--<div class="layui-form-item">--}}
+            {{--<label class="layui-form-label">父级赔率代码</label>--}}
+            {{--<div class="layui-input-block">--}}
+                {{--<input type="text" name="pcode" required  lay-verify="id" autocomplete="off" value="{{ isset($p_code)?$p_code:'' }}" class="layui-input" readonly="readonly">--}}
+            {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item">--}}
+            {{--<label class="layui-form-label">赔率代码</label>--}}
+            {{--<div class="layui-input-block">--}}
+                {{--<input type="text" name="code" required  lay-verify="id" autocomplete="off" value="{{ isset($odds_code)?$odds_code:'' }}" class="layui-input" readonly="readonly">--}}
+            {{--</div>--}}
+        {{--</div>--}}
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">父级赔率代码</label>
             <div class="layui-input-block">

resources/views/sports/tennis_match.blade.php

@@ -198,6 +198,27 @@
     //    });
 
     @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')
 @endsection