异常处理

app/Http/Controllers/Admin/SportsfootController.php

@@ -61,7 +61,6 @@ class SportsfootController extends Controller {
 		$newapp = new \App\Models\MoneyBuyMatch();
 		$simplex = $newapp->simsettleorder($match_id,$type);
 		$str = $newapp->strsettleorder($match_id);
-
 		//获取赛事结算进程下的注单
 		$simplex = commonFunction::getOrderData($data = [],$simplex,$type,$process);
 		$str = commonFunction::getOrderData($data = [],$str,$type,$process);
@@ -69,17 +68,14 @@ class SportsfootController extends Controller {
 		//获取注单id组成一维数组
 		$simplex_ids = array_column($simplex['settle'],'order_id');
 		$str_ids = array_column($str['settle'],'order_id');
-
 		//去重
 		$simplex_ids = array_unique($simplex_ids);
 		$str_ids = array_unique($str_ids);
-
 		//判断赛事下注单输赢
 		//单式
 		if(count($simplex_ids)>0){
 			$simids = implode(',',$simplex_ids);
 			$winfail = SwInterface::getInstance()->WinfailMulNomal($simids,'1');
-			//print_r($winfail);exit;
 			if($winfail['status'] != 1){
 				return json_encode(['status'=>2,'msg'=>'单式判断输赢错误,请联系管理员!!!']);//输赢错误
 			}
@@ -701,6 +697,11 @@ class SportsfootController extends Controller {
 		if($scores['half_corner']['guest'] != $data['half_corner']['guest']){
 			$process[] = 'half_corner_guest';
 		}
+		//上半场角球
+		if($scores['half_corner']['home'] != $data['half_corner']['home'] && $scores['half_corner']['guest'] != $data['half_corner']['guest']){
+			$process[] = 'half_corner';
+		}
+
 		//主队全场角球
 		if($scores['all_corner']['home'] != $data['all_corner']['home']){
 			$process[] = 'all_corner_home';
@@ -709,6 +710,10 @@ class SportsfootController extends Controller {
 		if($scores['all_corner']['guest'] != $data['all_corner']['guest']){
 			$process[] = 'all_corner_guest';
 		}
+		//全场角球
+		if($scores['all_corner']['home'] != $data['all_corner']['home'] && $scores['all_corner']['guest'] != $data['all_corner']['guest']){
+			$process[] = 'all_corner';
+		}
 		//主队上半场罚牌
 		if($scores['half_penalty']['home'] != $data['half_penalty']['home']){
 			$process[] = 'half_penalty_home';
@@ -717,6 +722,10 @@ class SportsfootController extends Controller {
 		if($scores['half_penalty']['guest'] != $data['half_penalty']['guest']){
 			$process[] = 'half_penalty_guest';
 		}
+		//上半场罚牌
+		if($scores['half_penalty']['home'] != $data['half_penalty']['home'] && $scores['half_penalty']['guest'] != $data['half_penalty']['guest']){
+			$process[] = 'half_penalty';
+		}
 		//主队全场罚牌
 		if($scores['all_penalty']['home'] != $data['all_penalty']['home']){
 			$process[] = 'all_penalty_home';
@@ -725,6 +734,10 @@ class SportsfootController extends Controller {
 		if($scores['all_penalty']['guest'] != $data['all_penalty']['guest']){
 			$process[] = 'all_penalty_guest';
 		}
+		//全场罚牌
+		if($scores['all_penalty']['home'] != $data['all_penalty']['home'] && $scores['all_penalty']['guest'] != $data['all_penalty']['guest']){
+			$process[] = 'all_penalty';
+		}
 
 		if($scores['all']['home'] != $data['all']['home'] || $scores['all']['guest'] != $data['all']['guest']){
 			$process[] = 'all';
@@ -732,7 +745,6 @@ class SportsfootController extends Controller {
 		if($scores['half']['home'] != $data['half']['home'] || $scores['half']['guest'] != $data['half']['guest']){
 			$process[] = 'half';
 		}
-
 		if(!empty($process)){
 			//赛事下注单作废 处理
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'zq',$process);

app/Http/Controllers/Api/SettlementController.php

@@ -48,13 +48,13 @@ class SettlementController extends Controller
 
     public function debug(Req $req)
     {
+        $ret = SwInterface::getInstance()->WinfailMulNomal('S20191115134824896580423,S2019111513484154555218',1);
+        var_dump($ret);
+
+        exit ;
 
         $ret = SwInterface::getInstance()->WinFailNomalOrder('S20191106102310815438283',1);
         print_r($ret);
-
-
-
-
         exit ;
 
         $match = DB::table('money_buy_match')->where(['order_id' => 'S20191102170628894846203'])->first();

app/Lib/Biz/Sport/Common.php

@@ -1682,11 +1682,16 @@ class Common
                 $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_fallp);
             }
             if(in_array('half',$process)){
-                //去除上半场角球注单
+                //去除上半场角球/罚牌注单
                 $matchOdds_hh = [];
                 foreach($matchOdds_h as $k){
                     foreach($matchOdds_hc as $kk){
-                        if($k['order_id'] != $kk['order_id']){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
+                            $matchOdds_hh[] = $k;
+                        }
+                    }
+                    foreach($matchOdds_hp as $kk){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
                             $matchOdds_hh[] = $k;
                         }
                     }
@@ -1696,7 +1701,12 @@ class Common
                 $matchOdds_halfh = [];
                 foreach($matchOdds_half as $k){
                     foreach($matchOdds_halfc as $kk){
-                        if($k['order_id'] != $kk['order_id']){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
+                            $matchOdds_halfh[] = $k;
+                        }
+                    }
+                    foreach($matchOdds_halfp as $kk){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
                             $matchOdds_halfh[] = $k;
                         }
                     }
@@ -1707,11 +1717,16 @@ class Common
                 $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_half);
             }
             if(in_array('all',$process)){
-                //去除全场角球注单
+                //去除全场角球/罚牌注单
                 $matchOdds_ff = [];
                 foreach($matchOdds_f as $k){
                     foreach($matchOdds_fc as $kk){
-                        if($k['order_id'] != $kk['order_id']){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
+                            $matchOdds_ff[] = $k;
+                        }
+                    }
+                    foreach($matchOdds_fp as $kk){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
                             $matchOdds_ff[] = $k;
                         }
                     }
@@ -1721,7 +1736,12 @@ class Common
                 $matchOdds_fallf = [];
                 foreach($matchOdds_fall as $k){
                     foreach($matchOdds_fallc as $kk){
-                        if($k['order_id'] != $kk['order_id']){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
+                            $matchOdds_fallf[] = $k;
+                        }
+                    }
+                    foreach($matchOdds_fallp as $kk){
+                        if($k['order_id'] && $kk['order_id'] && $k['order_id'] != $kk['order_id']){
                             $matchOdds_fallf[] = $k;
                         }
                     }