Merge branch 'master' of http://git.bocai108.com:10180/aqm/sports_admin

app/Http/Controllers/Admin/SportsbkController.php

@@ -38,7 +38,40 @@ class SportsbkController extends Controller {
 		$dt->enableCheckBox();
 		return view('admin/sportsbk/outcome', $dt->render($request));
 	}
+	
+	//查询赛事结果
+	function Matchresult(Req $req){
+		$match_id = $req->match_id;
+		$newapp = \App\Models\Stlqresult::where('match_id', $match_id)->first();
 
+		$array =array(
+			'corner_ball' => json_decode($newapp['corner_ball'],true),
+			'penalty_card' => json_decode($newapp['penalty_card'],true),
+			'newapp' => $newapp,
+		);
+		return $array;
+	}
+	
+	//结算
+	function Settlementlq(Req $req){
+		//查询赛事下所有订单
+		$ssid = $req->match_id;//赛事id
+		$type = $req->type;//是否再结算1,首次结算2,再次结算
+		$newapp = new \App\Models\MoneyBuyMatch();
+		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'lq'),'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,'lq',$ssid);//串式
+	        $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
+	        return responseToJson($data);
+	    }else{
+	    	return responseToJson($update);
+	    }
+	}
+	
 	function info() {
 		$page = Request::has('page') ? Request::get('page') : '';
 		$list = Request::has('limit') ? Request::get('limit') : 1;

app/Http/Controllers/Admin/SportsfootController.php

@@ -131,7 +131,7 @@ class SportsfootController extends Controller {
 
         //单式撤单返现
         $newapp = new \App\Models\MoneyBuyMatch();
-		$all = $newapp->allsimplexorder($match_id);
+		$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']);