Browse Source

测试赔率

彭俊 6 years ago
parent
commit
dda09db0d9

+ 1 - 73
app/Http/Controllers/Api/WriteSportsController.php

@@ -619,6 +619,7 @@ class WriteSportsController extends BaseController{
                 $up_odds_data = [];
                 //需写入赔率
                 $in_odds_data = [];
+
                 if(!empty($oddsData)){
                     foreach($oddsData as $k=>$v){
                         foreach($l_odds_data as $kk=>$vv){
@@ -700,79 +701,6 @@ class WriteSportsController extends BaseController{
                 }
 
             }
-
-            /*
-            //获取 赔率数据
-            $oddsData = $getData['data'];
-            if(!empty($oddsData)){
-                //获取 当前 所有 可用 赔率 sole
-                $odds_only = $getData['odds_only'];
-                //更新赛事下所有 不在本次请求的赔率 状态
-                $ret= OddsModel::upOddsStatus($models,$s_match_id,'',$source,$odds_only);
-                if($ret != true) throw new \Exception(Response::generate($gameName,Response::ODDS_SOLE_ERR));
-
-                //拼装 待写入 赔率数据
-                $ret_status_odds = [];
-                $ret_status_odds_r = [];
-                foreach($oddsData as $k=>$v){
-                    //组装数据
-                    $set_odds = [
-                        'match_id'=> $match_id?:0,
-                        'others_match_id'=> $v['match_id']?:0,
-                        'odds_code'=> $v['odds_code']?:'',
-                        'status'=> $v['status']?:0,
-                        'sort'=> $v['sort']?:0,
-                        'p_code'=> $v['p_code']?:'',
-                        'odds'=> $v['odds']?:0,
-                        'condition'=> $v['condition'],
-                        'odds_only'=> $v['odds_only']?:'',
-                        'source'=> $v['source']?:'',
-                        'type'=> $v['type']?:0,
-                        'team'=> $v['team']?:'',
-                        'lg_id'=> $lg_id,
-                        'others_lg_id'=> $v['lg_id'],
-                        'ctime'=> date('Y-m-d H:i:s'),
-                        'utime'=> date('Y-m-d H:i:s'),
-                    ];
-                    //写赔率记录数据
-                    // $ret = $models['model_odds_record']->updateOrCreate(
-                    //     ['odds_only'=>$v['odds_only']],$set_odds
-                    // );
-                    // if($ret->id < 1) {
-                    //     $ret_status_odds_r[] = 0;
-                    // }else{
-                    //     $ret_status_odds_r[] = 1;
-                    // }
-                    // if($ret->id < 1) throw new \Exception(Response::generate($gameName.'赔率记录-odds_only:'.$v['odds_only'].';',Response::ADD_ODDS_R_ERROR));
-
-                    $ret = $models['model_odds_record']::insert($set_odds);
-                    if($ret != true) throw new \Exception(Response::generate($gameName.'赔率记录-odds_only:'.$v['odds_only'].';',Response::ADD_ODDS_R_ERROR));
-
-
-                    //追加参数
-                    $set_odds['sole'] = $v['sole'];
-                    $set_odds['expire_time'] = date('Y-m-d H:i:s',time()+60);
-                    //写赔率 数据
-                    // $ret = $models['model_odds']->updateOrCreate(
-                    //     ['odds_only'=>$v['odds_only']],$set_odds
-                    // );
-                    // if($ret->id > 0) {
-                    //     $ret_status_odds[] = 1;
-                    // }
-                    // if($ret->id < 1) throw new \Exception(Response::generate($gameName.'赔率-odds_only:'.$v['odds_only'].';',Response::ADD_ODDS_ERROR));
-
-                    $ret = $models['model_odds']::insert($set_odds);
-                    if($ret != true) throw new \Exception(Response::generate($gameName.'赔率-odds_only:'.$v['odds_only'].';',Response::ADD_ODDS_ERROR));
-                }
-                // dd($ret_status_odds);
-
-                // if(in_array(0,$ret_status_odds_r) == true) throw new \Exception(Response::generate('',Response::ADD_ODDS_R_ERROR));
-
-                // if(count($ret_status_odds) != count($oddsData)) throw new \Exception(Response::generate('',Response::ADD_ODDS_ERROR));
-
-            }
-            */
-           
             //提交事务
             DB::commit();
             return Response::success();

+ 17 - 16
app/Models/SportsNoteList.php

@@ -60,9 +60,10 @@ class SportsNoteList extends BaseModel {
 
 
         for($i=0;$i<count($data);$i++){
+            // if($data[$i]->status==1 && $data[$i]->game_status==0){
+                // $data[$i]->order_status = '投注'.'<br>;<a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id='.$data[$i]->id.'\');"> 作废 </a>';
+            // }else 
             if($data[$i]->status==1 && $data[$i]->game_status==0){
-                $data[$i]->order_status = '投注'.'<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id='.$data[$i]->id.'\');"> 作废 </a>';
-            }else if($data[$i]->status==1 && $data[$i]->game_status!=0){
                 $data[$i]->order_status = '投注';
             }else if($data[$i]->status==2){
                 $data[$i]->order_status = '作废'.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
@@ -188,20 +189,20 @@ class SportsNoteList extends BaseModel {
                     }
                 }
             }
-            if($data[$i]->status == 1){
-                if($data[$i]->match_status == 0 || $data[$i]->match_status == 1){
-                    $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
-                }
-                if($data[$i]->match_status == 2 || $data[$i]->match_status == 3 || $data[$i]->match_status == 5){
-                    if($data[$i]->settle_status == '已结算'){
-                        $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
-                    }else{
-                        $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
-                    }
-                }
-            }else{
-                $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
-            }
+            // if($data[$i]->status == 1){
+                // if($data[$i]->match_status == 0 || $data[$i]->match_status == 1){
+                //     $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结算 </a>';
+                // }
+            //     if($data[$i]->match_status == 2 || $data[$i]->match_status == 3 || $data[$i]->match_status == 5){
+            //         if($data[$i]->settle_status == '已结算'){
+            //             $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/resettlement/?id=" href="javascript:resettlement(\'/admin/SoccerNoteList/resettlement/?id='.$data[$i]->id.'\');"> 重新结算 </a>';
+            //         }else{
+            //             $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm settlement" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/settlement/?id=" href="javascript:settlement(\'/admin/SoccerNoteList/settlement/?id='.$data[$i]->id.'\');"> 结算 </a>';
+            //         }
+            //     }
+            // }else{
+            //     $data[$i]->game_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 结2算 </a>';
+            // }
 
             $data[$i]->content = $data[$i]->content1.$data[$i]->content;
 

+ 3 - 0
app/Models/Stzqresult.php

@@ -15,6 +15,9 @@ class Stzqresult extends BaseModel
         } else { 
             $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score',$this->table.'.start_time','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->paginate ($list);
         }
+        for ($i=0; $i < count($data); $i++) { 
+            $data[$i]->newstime = date("Y-m-d H:i:s");
+        }
 
         return $data->toArray ();
 

+ 24 - 20
resources/views/admin/sportsfoot/outcome.blade.php

@@ -121,20 +121,24 @@
     </script>
 
     <script type="text/html" id="status">
-        <button onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果</button>
-        @{{#if(d.status==2 || d.status==3){ }}
-            @{{#if(d.status==2){ }}
-                <span><li class="layui-btn layui-btn-sm layui-btn-green set" onclick="settlement(@{{d.match_id}},1)">结算</li></span>
+        @{{#if(d.start_time < d.newstime){ }}
+            <button onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果</button>
+            @{{#if(d.status==2 || d.status==3){ }}
+                @{{#if(d.status==2){ }}
+                    <span><li class="layui-btn layui-btn-sm layui-btn-green set" onclick="settlement(@{{d.match_id}},1)">结算</li></span>
+                @{{#} }}
+                @{{#if(d.status==3){ }}
+                    <span><li class="layui-btn   layui-btn-sm layui-btn-normal reset" onclick="settlement(@{{d.match_id}},2)">再结算</li></span>
+                @{{#} }}
             @{{#} }}
-            @{{#if(d.status==3){ }}
-                <span><li class="layui-btn   layui-btn-sm layui-btn-normal reset" onclick="settlement(@{{d.match_id}},2)">再结算</li></span>
+            @{{#if(d.status!=4 && d.status!=3){ }}
+            <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revokeft(@{{d.match_id}})">作废</li></span>
             @{{#} }}
-        @{{#} }}
-        @{{#if(d.status!=4 && d.status!=3){ }}
-        <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="revokeft(@{{d.match_id}})">已作废</li></span>
+            @{{#if(d.status==4){ }}
+            <span><li class="layui-btn layui-btn-sm  layui-btn-danger" onclick="revokeft(@{{d.match_id}})">已作废</li></span>
+            @{{#} }}
+        @{{#}else{ }}
+            <span>比赛未开始</span>
         @{{#} }}
     </script>
 
@@ -157,14 +161,14 @@
     </script>
 
     <script type="text/html" id="sxalfcourt">
-      @{{#if(d.match_time!=null){ }}
-        <!-- <span>@{{ d.match_time}}</span> -->
-        <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> 
-        <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.id}}" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="inputTunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> / 
-        <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.id}}" name="home_score" value="@{{d.home_score}}" onchange="inputSunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
-        <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.id}}" name="guest_score" value="@{{d.guest_score}}" onchange="inputAunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
-
-      @{{#} }}
+        @{{#if(d.start_time < d.newstime){ }}
+            <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> 
+            <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.id}}" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="inputTunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> / 
+            <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.id}}" name="home_score" value="@{{d.home_score}}" onchange="inputSunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
+            <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.id}}" name="guest_score" value="@{{d.guest_score}}" onchange="inputAunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
+        @{{#}else{ }}
+            <span>比赛未开始</span>
+        @{{#} }}
     </script>