异常处理

app/Http/Controllers/Api/WriteSportsController.php

@@ -370,6 +370,131 @@ class WriteSportsController extends BaseController{
 
     }
 
+    public function __setMatch(Req $data){
+        //验证token
+        $user = new \App\Models\System_user;
+        if(empty($data->token)) return Response::generate('未获取到token',Response::TOKEN_ERR);
+        $token = $user::where(['token'=>$data->token])->value('token');
+        if(empty($token)) return Response::generate('token验证不通过',Response::TOKEN_ERR);
+        try {
+            //开启事务
+            DB::beginTransaction();
+            $obt = $data->data;
+            //请求 数据 为空
+            if(empty($obt)) throw new \Exception(Response::generate('请求数据为空，',Response::ABNORMAL));
+            $getData = $this->getAddData($obt);
+            //不是 赛事 数据
+            if($getData['title'] != 'match') throw new \Exception(Response::generate('不是赛事数据，',Response::ABNORMAL));
+
+            //写请求数据 日志记录
+            $setSportsRecord = St_set_sports_recordModel::setSportsRecord($getData['title'],$obt);
+            if($setSportsRecord < 1) throw new \Exception(Response::generate('',Response::SPORTS_RECORD_ERR));
+            //获取球类代码
+            $game_code = $getData['game_code'];
+            //获取数据源
+            $source = $getData['source'];
+            //获取球类名称
+            $gameName = gameModel::getGameName($game_code);
+            //获取 model
+            $models = commonFunction::getModels($game_code, 1);
+            //获取 赛事 数据
+            $matchData = $getData['data'];
+            //获取 当前请求 所有 uuid /match_id
+            $identity = [];
+            $s_match_ids = [];
+            foreach($matchData as $k=>$v){
+                $identity[] = $v['uuid'];
+                $s_match_ids[] = $v['match_id'];
+            }
+
+            //====验证 赛事 所属 联赛 是否存在====
+            $identity = array_unique($identity);
+            sort($identity);
+
+            //获取 本地 已存在 联赛
+            $l_lg_data = $models['model_local_league']::whereIn('identity',$identity)->select('identity','lg_id','others_lg_id')->get()->toArray();
+            //二维数组去重
+            $l_lg_data = commonFunction::uniquArrV2($l_lg_data,'identity');
+            //循环对比 请求uuid->本地identity
+            foreach($l_lg_data as $k=>$v){
+                foreach($identity as $kk=> $uuid){
+                    if($v['identity'] == $uuid){
+                        unset($identity[$kk]);
+                    }
+                }
+            }
+            sort($identity);
+            //去除本地和请求里都存在的联赛，如果还有剩余联赛id,则返回异常
+            if(!empty($identity))  throw new \Exception(Response::generate($gameName.'联赛：uuid-'.$identity[0].';',Response::LEAGUE_ERROR));
+            //====end====
+
+            //====获取 本地 已存在 赛事====
+            $s_match_ids = array_unique($s_match_ids);
+            sort($s_match_ids);
+
+            $l_match_data = $models['model_local_match']::whereIn('others_match_id',$s_match_ids)->where('source',$source)->select('others_match_id','match_id')->get()->toArray();
+            //二维数组去重
+            $l_match_data = commonFunction::uniquArrV2($l_match_data,'others_match_id');
+        
+            //循环对比 请求match_id->本地others_match_id 
+            //如果本地有 赛事，则取出本地不存在赛事
+            if(!empty($l_match_data)){
+                foreach($l_match_data as $k=>$v){
+                    foreach($s_match_ids as $kk=> $s_match_id){
+                        if($v['others_match_id'] == $s_match_id){
+                            unset($s_match_ids[$kk]);
+                        }
+                    }
+                }
+                sort($s_match_ids);
+            }
+           
+            //剩余 赛事 数据 写入
+            if(!empty($s_match_ids)){
+                //上半场赛事
+                $half_match = [];
+                $other_match = [];
+                foreach($matchData as $k=>$v){
+                    foreach($s_match_ids as $kk=> $s_match_id){
+                        if($v['match_id'] == $s_match_id){
+                            //取出上半场赛事
+                            if($v['half_match_id'] == 0){
+                                $half_match[] = $v;
+                            }else{
+                            //取出其他赛事
+                                $other_match[] = $v;
+                            }
+                        }
+                    }
+                }
+
+                //如果有上半场赛事，则先处理
+                if(!empty($half_match)){
+                    $set_half_match = [];
+                    foreach($half_match as $k=>$v){
+                         $data = $v;
+                         //验证本赛事是否有数据源lg_id
+                         if(empty($data['lg_id'])) throw new \Exception(Response::generate($gameName.'赛事-match_id:'.$data['match_id'].';',Response::S_LG_ID_NULL));
+                         $lg_id = commonFunction::searcharray($data['lg_id'],'others_lg_id',$l_lg_data,'lg_id');
+                         //验证 本赛事是否获取到本地lg_id
+                         if(empty($lg_id)) throw new \Exception(Response::generate($gameName.'赛事-match_id:'.$data['match_id'].';',Response::L_LG_ID_NULL));
+                   
+
+                    }
+                }
+            }
+    
+            //提交事务
+            DB::commit();
+            return Response::success();
+        } catch (\Exception $e) {
+            //回滚事务
+            DB::rollBack();
+            return $e->getMessage();
+        }
+
+    }
+
     /*
      * 写 赛事 结果 记录 数据
      * 每个请求 包含 N个联赛 下 N个赛事 结果数据
@@ -519,7 +644,7 @@ class WriteSportsController extends BaseController{
             //获取源数据赛事ID
             $s_match_id = $getData['match_id'];
             //获取赔率所属赛事 tag 值 玩法数量
-            $tag = $getData['tag'];
+            $tag = $getData['tag']?:99;
 
             //获取球类名称
             $gameName = gameModel::getGameName($game_code);
@@ -529,6 +654,8 @@ class WriteSportsController extends BaseController{
             $match_id = $this->matchVerify($models,$s_match_id,$source,$gameName);
 
             //更新赛事 tag 值
+            //如果未获取到本地赛事id，则返回异常
+            if(empty($match_id)) throw new \Exception(Response::generate($gameName.'赛事-match_id:'.$s_match_id.';',Response::L_MATCH_ID_ERR)) ;
             $upMatch = $models['model_match']::where(['id'=>$match_id])
             ->update(['tag'=>$tag,'utime'=>date('Y-m-d H:i:s')]);
             if($upMatch < 1) throw new \Exception(Response::generate($gameName.'赛事-match_id:'.$s_match_id.';',Response::UPMATCHTAG_ERROR)) ;

app/Http/Response/Response.php

@@ -45,6 +45,8 @@ class Response
     const L_LG_ID_NULL = 10036;
     //请求数据写日志记录失败
     const SPORTS_RECORD_ERR = 10037;
+    //未获取到本地赛事id
+    const L_MATCH_ID_ERR = 10038;
 
 
     private static $errorMsgs = [
@@ -85,6 +87,8 @@ class Response
         self::L_LG_ID_NULL => '未获取到本地lg_id',
         //===写请求数据日志记录失败===
         self::SPORTS_RECORD_ERR=>'写请求数据日志记录失败',
+        //===未获取到本地赛事id===
+        self::L_MATCH_ID_ERR=>'未获取到赔率所属本地赛事id',
 
     ];
 

app/Lib/Settlement/Adapter/RulePlus.php

@@ -318,32 +318,21 @@ trait RulePlus
         $goalhlefnum = intval($resultModels->u_home_score)+intval($resultModels->u_guest_score);
 
         if($model->odds_code == $type){
-            if($goalnum != 0){
+            if($goalnum != 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($goalnum == 0){
+            if($goalnum == 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($goalhlefnum != 0){
+            if($goalhlefnum != 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($goalhlefnum == 0){
+            if($goalhlefnum == 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //独赢&进球大小  sw_MOU
@@ -357,158 +346,84 @@ trait RulePlus
         $guest = intval($resultModels->guest_score);
 
         if($model->odds_code == $type){
-            if($homeda > 1.5){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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 ){
+            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 ){
+            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 ){
+            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 ){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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 ){
+            if($guestxiao > 1.5 )
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //判断 独赢&双方球队进球 是--进球 否--没进球  sw_MTS
@@ -517,44 +432,27 @@ trait RulePlus
         $guest = intval($resultModels->guest_score);
         
         if($model->odds_code == $type){
-            if($home != 0){
+            if($home != 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($home == 0){
+            if($home == 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($guest != 0){
+            if($guest != 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($guest == 0){
+            if($guest == 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($home == $guest){
+            if($home == $guest)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($home != $guest){
+            if($home != $guest)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //判断 进球大/小&双方球队进球  sw_OUT
@@ -565,44 +463,27 @@ trait RulePlus
         $guestxiao = intval($resultModels->home_score)-intval($resultModels->guest_score);//客队小
 
         if($model->odds_code == $type){
-            if($homeda > 1.5){
+            if($homeda > 1.5)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($home == 0){
+            if($home == 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($guest != 0){
+            if($guest != 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($guest == 0){
+            if($guest == 0)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($home == $guest){
+            if($home == $guest)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($home != $guest){
+            if($home != $guest)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //独赢 & 最先进球  ？？？   sw_MPG
@@ -614,44 +495,27 @@ trait RulePlus
         $guest = intval($resultModels->guest_score);//客队得分
 
         if($model->odds_code == $type){
-            if($firstscore == $homename && $home > $guest){
+            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){
+            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){
+            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){
+            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){
+            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){
+            if($firstscore == $guestname && $home == $guest)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //首个进球方式  sw_FG
@@ -659,44 +523,27 @@ trait RulePlus
         $firststye = json_decode($resultModels->first_score,true)['scoretype'];//最先进球
 
         if($model->odds_code == $type){
-            if($firststye == "射门"){
+            if($firststye == "射门")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($firststye == "头球"){
+            if($firststye == "头球")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($firststye == "无进球"){
+            if($firststye == "无进球")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($firststye == "点球"){
+            if($firststye == "点球")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($firststye == "任意球"){
+            if($firststye == "任意球")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else if($model->odds_code == $type){
-            if($firststye == "乌龙球"){
+            if($firststye == "乌龙球")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //双重机会&进球大/小  sw_DU 
@@ -706,152 +553,81 @@ trait RulePlus
         $allscore = intval($resultModels->guest_score) + intval($resultModels->home_score);//客队得分
 
         if($model->odds_code == $type){
-            if($allscore > 1.5 && $homescore > $guestscore || $homescore == $guestscore){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            if($allscore < 4.5 && $homescore > $guestscore || $homescore < $guestscore)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //双重机会&双方球队进球  sw_DS 
@@ -933,44 +709,27 @@ trait RulePlus
         $guestname = $resultModels->guest_team;//客队
 
         if($model->odds_code == $type){
-            if($firstscore == $homename && $home == $guest || $home > $guest){
+            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){
+            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){
+            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){
+            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){
+            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){
+            if($firstscore == $homename && $home < $guest || $home == $guest)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //进球大/小&进球单/双  sw_OUE
@@ -986,104 +745,57 @@ trait RulePlus
         }
 
         if($model->odds_code == $type){
-            if($homeda > 1.5 && $text == "单"){
+            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 == "单"){
+            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 == "双"){
+            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 == "双"){
+            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 == "单"){
+            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 == "单"){
+            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 == "双"){
+            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 == "双"){
+            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 == "单"){
+            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 == "单"){
+            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 == "双"){
+            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 == "双"){
+            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 == "单"){
+            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 == "单"){
+            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 == "双"){
+            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 == "双"){
+            if($homexiao > 4.5 && $text == "双")
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
     
     //进球大/小&最先进球 sw_OUP
@@ -1095,104 +807,57 @@ trait RulePlus
         $homexiao = intval($resultModels->guest_score) - intval($resultModels->home_score);
 
         if($model->odds_code == $type){
-            if($homeda > 1.5 && $firstscore == $homename){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            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){
+            if($homexiao > 3.5 && $firstscore == $guestname)
                 return ['result' => 1, 'matchResult' => $allword];
-            }else{
-                return ['result' => -1, 'matchResult' => $allword];
-            }
         }else{
             return ['result' => 100,'matchResult' => "参数不存在"];
         }
+        return ['result' => -1, 'matchResult' => $allword];
     }
 
     //落后反超获胜  sw_BH