瀏覽代碼

异常处理

彭俊 6 年之前
父節點
當前提交
24e50de5d0

+ 2 - 1
app/Http/Controllers/Admin/IndexController.php

@@ -101,7 +101,8 @@ class IndexController extends Controller
             if($str && $simplex){
                 for($i=0;$i<count($str);$i++){
                     for($j=0;$j<count($simplex);$j++){
-                        if($str[$i]['account_identity'] == $simplex[$j]['account_identity']){
+                        if(!empty($str[$i]) && !empty($simplex[$j]['account_identity'])
+                            && $str[$i]['account_identity'] == $simplex[$j]['account_identity']){
                             unset($str[$i]);
                             unset($simplex[$j]);
                         }

+ 1 - 1
app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -51,7 +51,7 @@ class SoccerNoteListController extends Controller
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
         $dt->addColsFields('game_status', array('templet' => '#game_status', 'sort' => false, 'width' => 114));
-        //$arr[] = 'view';
+        //$arr[] = 'view';/
 //        if (checkRriv('/admin/SoccerNoteList/edit')) {
 //            $arr[] = 'edit';
 //        }

+ 34 - 15
app/Http/Controllers/Admin/SportsbkController.php

@@ -32,8 +32,9 @@ class SportsbkController extends Controller {
 		$dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		$dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 70));
 		$dt->addColsFields('csnum', array('templet' => '#csnum', 'sort' => false, 'width' => 70));
-		$dt->addColsFields('sectionone_two', array('templet' => '#sectionone_two', 'sort' => false, 'width' => 170));
-		$dt->addColsFields('sectionthere_four', array('templet' => '#sectionthere_four', 'sort' => false, 'width' => 220));
+		$dt->addColsFields('match_score', array('sort' => false, 'width' => 170));
+//		$dt->addColsFields('sectionone_two', array('templet' => '#sectionone_two', 'sort' => false, 'width' => 170));
+//		$dt->addColsFields('sectionthere_four', array('templet' => '#sectionthere_four', 'sort' => false, 'width' => 220));
 		$dt->addColsFields('status', array('templet' => '#matchstatus', 'sort' => false, 'width' => 80));
 		$dt->addColsFields('operation', array('templet' => '#operation', 'sort' => false, 'width' => 300));
         $dt->enableCheckBox();
@@ -113,34 +114,50 @@ class SportsbkController extends Controller {
 				'guest' => intval($req->guestn)?intval($req->guestn):0,
 			),
 		);
+		$array = array();
+		foreach($data as $key){
+			$array[] = $key['home'];
+			$array[] = $key['guest'];
+		}
+
+		//赛事下注单作废 处理
+		if(in_array(-1,$array)){
+			commonFunction::HandleInvalid($data,$match_id,$match_status,'lq');
+		}
 
 		$guestscore =array(
 			'1' => $data[1]['guest'],//第一节客队比分
 			'2' => $data[2]['guest'],//第二节客队比分
 			'3' => $data[3]['guest'],//第三节客队比分
 			'4' => $data[4]['guest'],//第四节客队比分
-			'5' => $data[5]['guest'],//上半场客队比分
-			'6' => $data[6]['guest'],//下半场客队比分
-			'all' => $data["all"]['guest'],//全场客队比分
 		);
 		$homescore =array(
 			'1' => $data[1]['home'],//第一节客队比分
 			'2' => $data[2]['home'],//第二节客队比分
 			'3' => $data[3]['home'],//第三节客队比分
 			'4' => $data[4]['home'],//第四节客队比分
-			'5' => $data[5]['home'],//上半场客队比分
-			'6' => $data[6]['home'],//下半场客队比分
-			'all' => $data["all"]['home'],//全场客队比分
 		);
+		$updatainfo = [
+			"home_score"=>json_encode($homescore),
+			"guest_score"=>json_encode($guestscore),
+			"inning"=>json_encode($data),
+			"u_home_score"=>$data[5]['home'],
+			"u_guest_score"=>$data[5]['guest'],
+			"s_home_score"=>$data[6]['home'],
+			"s_guest_score"=>$data[6]['guest'],
+			"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
+			'is_correct'=>1
+		];
+
+		\App\Models\Stlqresult::where('match_id', $match_id)->update($updatainfo);
 
-		//赛事下注单作废 处理
-		if(in_array(-1,$guestscore) || in_array(-1,$homescore)){
-			commonFunction::HandleInvalid($data,$match_id,$match_status,'lq');
-		}
-
-//		\App\Models\Stlqresult::where('match_id', $match_id)->update(["home_score"=>json_encode($homescore),"guest_score"=>json_encode($guestscore)]);
+		$addnew = new \App\Models\Comendnotice();
+		$addnew->addcomendnotice($match_id,'lq');
 
-		\App\Models\Stlqresult::where('match_id', $match_id)->update(["inning"=>json_encode($data)]);
+		$twoapp = new \App\Models\SportsBasket();
+		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+		$newapp = new \App\Models\Stlqresult();
+		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
 		//添加赛事结果记录
 		$lastLog = \App\Models\Stlqresultlog::where([
@@ -150,6 +167,8 @@ class SportsbkController extends Controller {
 		if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
 			\App\Models\Stlqresultlog::insert([
 				'match_id' => $match_id,
+				'home_score' => json_encode($homescore),
+			    'guest_score' => json_encode($guestscore),
 				'inning' => json_encode($data),
 				'user_id' => session('adminInfo.admin_id'),
 				'type' => 1,

+ 19 - 2
app/Http/Controllers/Admin/SportsbqController.php

@@ -32,7 +32,7 @@ class SportsbqController extends Controller {
         $dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 80));
 		// $dt->addColsFields('csnum', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
 		$dt->addColsFields('csnum', array('templet' => '#csnum', 'sort' => false, 'width' => 110));		
-        $dt->addColsFields('match_score', array('templet' => '#match_score', 'sort' => false, 'width' => 220));
+        $dt->addColsFields('match_score', array( 'sort' => false, 'width' => 220));//'templet' => '#match_score',
         $dt->addColsFields('statusmatch', array('templet' => '#statusmatch', 'sort' => false, 'width' => 80));
         $dt->addColsFields('operation', array('templet' => '#operation', 'sort' => false, 'width' => 300));
         $dt->enableCheckBox();
@@ -288,7 +288,24 @@ class SportsbqController extends Controller {
 			commonFunction::HandleInvalid($uscore,$match_id,$match_status,'bq');
 		}
 
-		\App\Models\Stbqresult::where('match_id', $match_id)->update(["match_score_t"=>json_encode($uscore)]);
+		$updatainfo = [
+			"home_score"=>$data['all']['home'],
+			"guest_score"=>$data['all']['guest'],
+			"match_score_t"=>json_encode($uscore),
+			"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
+			"u_home_score"=>$data['five']['home'],
+			"u_guest_score"=>$data['five']['guest'],
+			'is_correct'=>1,
+		];
+		\App\Models\Stbqresult::where('match_id', $match_id)->update($updatainfo);
+
+		$addnew = new \App\Models\Comendnotice();
+		$addnew->addcomendnotice($match_id,'bq');
+
+		$twoapp = new \App\Models\SportsBase();
+		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+		$newapp = new \App\Models\Stbqresult();
+		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
 		//添加赛事结果记录
         $lastLog = \App\Models\Stbqresultlog::where([

+ 16 - 9
app/Http/Controllers/Admin/SportsfootController.php

@@ -457,7 +457,8 @@ class SportsfootController extends Controller {
 		$dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
 		$dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 70));
 		$dt->addColsFields('csnum', array('templet' => '#csnum', 'sort' => false, 'width' => 100));
-		$dt->addColsFields('sxalfcourt', array('templet' => '#sxalfcourt', 'sort' => false, 'width' => 210));
+		$dt->addColsFields('match_score', array('sort' => false, 'width' => 210));
+		//$dt->addColsFields('sxalfcourt', array('templet' => '#sxalfcourt', 'sort' => false, 'width' => 210));
         $dt->addColsFields('statusmatch', array('templet' => '#statusmatch', 'sort' => false, 'width' => 100,'align' => 'left'));
 		$dt->addColsFields('operation', array('templet' => '#status', 'sort' => false, 'width' => 300));
         // $arr[] = 'view';
@@ -488,10 +489,10 @@ class SportsfootController extends Controller {
 				'guest' => intval($req->guestall)?intval($req->guestall):0,
 			),
 		);
-		$array[] = $data['half']['home'];
-		$array[] = $data['half']['guest'];
-		$array[] = $data['all']['home'];
-		$array[] = $data['all']['guest'];
+		foreach($data as $key){
+			$array[] = $key['home'];
+			$array[] = $key['guest'];
+		}
 		//赛事下注单作废 处理
 		if(in_array(-1,$array)){
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'zq');
@@ -514,7 +515,7 @@ class SportsfootController extends Controller {
         	'scoretime'=>intval($req->onescoretime)?intval($req->onescoretime):0,
         	'scoretype'=>$req->firststye ? $req->firststye:0,
         );
-
+		$model->match_score = $data['all']['home'].':'.$data['all']['guest'];
 		$model->u_home_score = $data['half']['home'];
 		$model->u_guest_score = $data['half']['guest'];
 		$model->home_score = $data['all']['home'];
@@ -523,9 +524,16 @@ class SportsfootController extends Controller {
 		$model->match_winer = $req->matchwiner?$req->matchwiner:'';
 		$model->penalty_card = json_encode($penaltycard,JSON_UNESCAPED_UNICODE);
 		$model->corner_ball = json_encode($cornerball,JSON_UNESCAPED_UNICODE);
-		$model->first_score = json_encode($firstone,JSON_UNESCAPED_UNICODE); 
+		$model->first_score = json_encode($firstone,JSON_UNESCAPED_UNICODE);
+		$model->is_correct = 1;
+		$model->save();
 
-        $model->save();
+		$update = $this->addcomendnotice($match_id);
+
+		$twoapp = new \App\Models\SportsSoccer();
+		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+		$newapp = new \App\Models\Stzqresult();
+		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
         //添加赛事结果记录
         $lastLog = \App\Models\Stzqresultlog::where([
@@ -1004,7 +1012,6 @@ class SportsfootController extends Controller {
 			$model->ctime = date('Y-m-d H:i:s');
 			$model->save();
 		}
-		return responseToJson(1);
 	}
 	
 }

+ 20 - 2
app/Http/Controllers/Admin/SportswqController.php

@@ -39,7 +39,7 @@ class SportswqController extends Controller {
         $dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 80));
 		// $dt->addColsFields('csnum', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
 		$dt->addColsFields('csnum', array('templet' => '#csnum', 'sort' => false, 'width' => 110));
-        $dt->addColsFields('match_score', array('templet' => '#matchscore', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('match_score', array('sort' => false, 'width' => 160));//'templet' => '#matchscore',
         $dt->addColsFields('statusmatch', array('templet' => '#statusmatch', 'sort' => false, 'width' => 80));
         $dt->addColsFields('operation', array('templet' => '#operation', 'sort' => false, 'width' => 300));
         $dt->enableCheckBox();
@@ -276,7 +276,25 @@ class SportswqController extends Controller {
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'wq');
 		}
 
-		\App\Models\Stwqresult::where('match_id', $match_id)->update(["inning"=>json_encode($data)]);
+		$updatainfo = [
+			"home_player_score"=>$data['all']['home'],
+			"guest_player_score"=>$data['all']['guest'],
+			"inning"=>json_encode($data),
+			"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
+			"first_inning_score"=>$data[1]['home'].':'.$data[1]['guest'],
+			"second_inning_score"=>$data[2]['home'].':'.$data[2]['guest'],
+			"third_inning_score"=>$data[3]['home'].':'.$data[3]['guest'],
+			'is_correct'=>1,
+		];
+		\App\Models\Stwqresult::where('match_id', $match_id)->update($updatainfo);
+
+		$addnew = new \App\Models\Comendnotice();
+		$addnew->addcomendnotice($match_id,'wq');
+
+		$twoapp = new \App\Models\SportsTennis();
+		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+		$newapp = new \App\Models\Stwqresult();
+		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
         //添加赛事结果记录
         $lastLog = \App\Models\Stwqresultlog::where([

+ 3 - 3
app/Http/Controllers/Api/CrontabController.php

@@ -31,7 +31,7 @@ class CrontabController extends BaseController{
         try {
             //开启事务
             DB::beginTransaction();
-            $time =90;
+            $time =60*5;
             //处理指定时间内的滚球待审核订单
             SportsNoteListModel::getOrderData($time);
             //提交事务
@@ -75,13 +75,13 @@ class CrontabController extends BaseController{
     }
 
     /**
-     * 定时执行 处理时间段内赛事已取消的注单
+     * 定时执行 处理时间段内赛事已取消的注单1
      */
     public function HandleOrderInvalid(){
         try {
             //开启事务
             DB::beginTransaction();
-            $time = 60*30;//5分钟
+            $time = 60*5;//5分钟
             //处理指定时间内已取消赛事的注单
             SportsNoteListModel::HandleOrderInvalid($time);
             //提交事务

+ 1 - 0
app/Models/MoneyBuyMatch.php

@@ -45,6 +45,7 @@ class MoneyBuyMatch extends Model
             $typeWhere = [
                 ['money_buy_match.bet_type', '=', 1],
                 ['money_buy_match.game_code', '=', $code],
+                ['money_buy_simplex.status', '=', 1],
             ];
             $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->select($select)->whereIn('money_buy_match.match_id',$match_ids)->where($typeWhere)->get();
         }else{

+ 200 - 5
app/Models/SportsNoteList.php

@@ -30,9 +30,197 @@ class SportsNoteList extends BaseModel
         return $this->hasMany(MoneyBuyMatch::class, 'order_id', 'order_id');
     }
 
+    /**
+     * 获取单式注单 数据
+     * 测试 使用
+     */
+    function getinfo($list = 10, $page, $where = '', $type){
+        $orderData = $this
+            ->join('money_details', 'money_details.info_identity', '=', 'money_buy_simplex.info_identity')
+            ->join('st_' . $type . '_competition', 'st_' . $type . '_competition.id', '=', 'money_buy_simplex.match_id')
+            //->join('money_buy_match','money_buy_match.order_id','=','money_buy_simplex.order_id')
+            ->join('st_' . $type . '_league', 'money_buy_simplex.lg_id', '=', 'st_' . $type . '_league.id')
+            ->select('money_buy_simplex.id', 'money_buy_simplex.account_name', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status','money_buy_simplex.use_mark', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'st_' . $type . '_competition.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese as league', 'st_' . $type . '_league.last_time')
+            ->whereIn('money_buy_simplex.roll_ratify',array(0,1,-1))
+            ->where($where)
+            //->distinct('money_buy_match.order_id')
+            ->orderby('money_buy_simplex.money_time', 'desc')
+            ->paginate($list);
+        if (count($orderData) < 1) {
+            return -2021052003; //
+        }
+        //获取各球类 控制器名
+        if($type == 'zq'){
+            $c_name = 'sportsfoot';
+        }
+        if($type == 'lq'){
+            $c_name = 'Sportsbk';
+        }
+        if($type == 'wq'){
+            $c_name = 'Sportswq';
+        }
+        if($type == 'bq'){
+            $c_name = 'Sportsbq';
+        }
 
-    function getinfo($list = 10, $page, $where = '', $type)
-    {
+        //获取注单 id
+        $order_ids = [];
+        //重组 注单数据
+        foreach($orderData as $k=>$v){
+            //所有注单 id
+            $order_ids[] = $v->order_id;
+            $v->match_id_order = '<a href="/admin/'.$c_name.'/outcome?home_team=' . $v->match_id . '">' . $v->match_id . '</a> (<span>' . $v->account_name . '</span>)<br>' . $v->order_id;
+            $v->home_guest = $v->home_team . ' VS ' . $v->guest_team;
+            $v->time = '开赛:' . $v->match_date . ' ' . $v->match_time;
+        }
+
+        //获取 注单 反水 金额变动记录
+        $select_fs = ['trade_id','money','money_cash'];
+        $water_return_money = \App\Models\Money_details::SELECT($select_fs)->where('trade_type', '7')->whereIn('trade_id',$order_ids)->get();
+
+        //获取 注单 作废 金额变动记录
+        $select_zf = ['trade_id','money','money_cash'];
+        $invalid_money = \App\Models\Money_details::SELECT($select_zf)->where('trade_type', '3')->whereIn('trade_id',$order_ids)->get();
+
+        dd($invalid_money->toArray());
+        //获取注单 输赢 结果
+        $select_play = ['order_id','result','matchresult','condition','odds','odds_code','bet_money','home_team','guest_team'];
+        $content = \App\Models\MoneyBuyMatch::SELECT($select_play)->where('bet_type', '1')->whereIn('order_id',$order_ids)->get();
+
+        //获取 注单 玩法
+        $select_code = ['odds_code','odds_name'];
+        $result = \App\Models\Matchcode::SELECT($select_code)->where('game_code', $type)->get();
+
+        //拼接注单 玩法
+        foreach($content as $k=>$v){
+            foreach($result as $kk=>$vv){
+                if($v->odds_code == $vv->odds_code){
+                    $v->content = $vv->odds_name . '<br>' . $v->condition . '@' . $v->odds . ' ¥' . $v->bet_money . '<br>';
+                }
+            }
+        }
+
+        //生成最终数据
+        foreach($orderData as $k=>$v){
+            //追加输赢结果 /投注详情
+            $v->content = $this->getOrderC($content,$v);
+            
+            //下注时间/开赛时间
+            $v->money_match_time = '下注:' . $v->money_time . $v->time;
+
+           
+            if ($v->status == 2 || $v->status == 3) {
+            }
+
+            //未作废/撤单 数据
+            if($v->status < 2){
+                //反水
+                $v->water_return = commonFunction::filter_by_value($water_return_money,'trade_id',$v->order_id)['money'];
+                //结果金额  反水+中奖金额
+                $v->result = $v->water_return + $v->gain_money;
+
+                //用户投注前账户金额
+                $v->available_cash = $v->money_cash + $v->money;
+                //用户投注后账户金额
+                $v->frozen_cash = commonFunction::filter_by_value($water_return_money,'trade_id',$v->order_id)['money_cash'];
+           
+                //投注前后账户金额
+                $v->account_money = $v->available_cash . '<br><span>' . $v->money . '</span><br>' . $v->frozen_cash;
+
+            }else{//已作废/撤单
+                //反水
+                $v->water_return = 0;
+                //如果注单已作废 结果金额 = 投注金额
+                $v->result = $v->money;
+
+                //作废资金变动
+                $money_data = commonFunction::filter_by_value($invalid_money,'trade_id',$v->order_id);
+                //用户作废后账户金额
+                $v->frozen_cash = $money_data['money_cash'];
+                 //用户作废前账户金额
+                 $v->available_cash = $v->frozen_cash - $v->money;
+                //作废前后账户金额
+                $v->account_money = $v->available_cash . '<br><span>' . $v->money . '</span><br>' . $v->frozen_cash;
+
+            }
+
+            //===结算/订单状态===
+            if ($v->settle_status == 1) {
+                $settle_status = '未结算';
+            } else{
+                $settle_status = '已结算';
+            }
+            if($v->status==1 && $v->settle_status == 1){
+                $v->order_status = '投注<br>'.$settle_status;
+            }
+            else if ($v->status == 1 && $v->settle_status != 1) {
+                $v->order_status = '投注<br>'.$settle_status;
+
+            } else if ($v->status == 2) {
+                $v->order_status = '作废<br>'.$v->use_mark;
+            } else if ($v->status == 3) {
+                $v->order_status = '撤单<br>'.$settle_status;
+            }
+            if ($v->game_status == 0) {
+                $v->game_status = '未处理';
+            } else {
+                $v->game_status = '已处理';
+            }
+            //===end===
+          
+        }
+        return $orderData->toArray();
+    }
+
+    /**
+     * 拼接 订单详情 字段内容
+     */
+    public function getOrderC($content,$order){
+
+        $content_str = commonFunction::filter_by_value($content,'order_id',$order->order_id);
+
+         //===投注详情===
+         if (!empty($order->match_time)) {
+            $content1 = '[' . $order->match_time . ']';
+        } else if (!empty($order->last_time)) {
+            $datetime = explode(' ', $order->last_time);
+            $content1 = '[' . $datetime[1] . ']';
+        }
+
+        // 当前赛事 投注 结果  0未处理  1 赢 -1输  2平 3赢半平半  4输半平半
+        if ($content_str['result'] == 0) {
+            $content = $content1.$content_str['content'];
+        } else {
+            if ($content_str['result'] == 0) {
+                $content_str['result'] = '未处理';
+            }
+            if ($content_str['result'] == 1) {
+                $content_str['result'] = '赢';
+            }
+            if ($content_str['result'] == -1) {
+                $content_str['result'] = '输';
+            }
+            if ($content_str['result'] == 2) {
+                $content_str['result'] = '平';
+            }
+            if ($content_str['result'] == 3) {
+                $content_str['result'] = '赢半平半';
+            }
+            if ($content_str['result'] == 4) {
+                $content_str['result'] = '输半平半';
+            }
+            $content = $content1.$content_str['content']. '<span>' . $content_str['result'] . '</span>(' . $content_str['matchresult'] . ')<br>';
+        }
+
+        return $content;
+    }
+
+
+    /**
+     * 获取单式注单 数据
+     * 因异常 暂停使用
+     */
+    function __getinfo($list = 10, $page, $where = '', $type){
         $data = $this
             ->join('money_details', 'money_details.info_identity', '=', 'money_buy_simplex.info_identity')
             ->join('st_' . $type . '_competition', 'st_' . $type . '_competition.id', '=', 'money_buy_simplex.match_id')
@@ -523,7 +711,7 @@ class SportsNoteList extends BaseModel
             }
             $data[$i]->money_match_time = '下注:' . $data[$i]->money_time . $data[$i]->time;
 
-            /*
+            /*1
             $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
             $data[$i]->time = '开赛:'.$data[$i]->match_date.' '.$data[$i]->match_time;
             $data[$i]->money_match_time = '下注:'.$data[$i]->money_time.'<br>'.$data[$i]->time;
@@ -547,8 +735,15 @@ class SportsNoteList extends BaseModel
                 //用户投注后账户金额
                 $data[$i]->frozen_cash = $data[$i]->money_cash;
             }
-            //此时结果金额
-            $data[$i]->result = $data[$i]->water_return + $data[$i]->gain_money;
+            //如果是作废/撤单状态 结果金额 为投注金额
+            if ($data[$i]->status == 2 || $data[$i]->status == 3){
+                //此时结果金额
+                $data[$i]->result = $data[$i]->money;
+            }else{
+                //此时结果金额
+                $data[$i]->result = $data[$i]->water_return + $data[$i]->gain_money;
+            }
+           
             //用户投注前账户金额
             $data[$i]->available_cash = $data[$i]->money_cash + $data[$i]->money;
             //投注前后账户金额

+ 1 - 1
resources/views/admin/Sportsbq/outcome.blade.php

@@ -200,7 +200,7 @@
                 layerOpen = layer.open({
                   type: 1 //Page层类型
                   ,area: ['500px', '460px']
-                  ,title: '<h2>赛事结果添加<h2>'
+                  ,title: '<h2>赛事结果修改<h2>'
                   ,shade: 0.6 //遮罩透明度
                   ,maxmin: true //允许全屏最小化
                   ,anim: 1 //0-6的动画形式,-1不开启

+ 1 - 1
resources/views/admin/Sportswq/outcome.blade.php

@@ -193,7 +193,7 @@
                 layerOpen = layer.open({
                   type: 1 //Page层类型
                   ,area: ['500px', '300px']
-                  ,title: '<h2>赛事结果添加<h2>'
+                  ,title: '<h2>赛事结果修改<h2>'
                   ,shade: 0.6 //遮罩透明度
                   ,maxmin: true //允许全屏最小化
                   ,anim: 1 //0-6的动画形式,-1不开启

+ 2 - 2
resources/views/admin/matchRule/editMatchRule.blade.php

@@ -115,11 +115,11 @@
 
             //var um = UM.getEditor('myEditor');
             var um = UM.getEditor('myEditor', {
-                initialFrameWidth: 1000,
+                initialFrameWidth: 933,
                 initialFrameHeight: 400
             });
             var umtwo = UM.getEditor('myEditortwo', {
-                initialFrameWidth: 1000,
+                initialFrameWidth: 933,
                 initialFrameHeight: 400
             });
             /*var editIndex = layedit.build('LAY_demo_editor');*/

+ 1 - 1
resources/views/admin/sportsbk/outcome.blade.php

@@ -376,7 +376,7 @@
                     layerOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['500px', '320px']
-                        ,title: '<h2>赛事结果添加<h2>'
+                        ,title: '<h2>赛事结果修改<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化
                         ,anim: 1 //0-6的动画形式,-1不开启

+ 33 - 32
resources/views/admin/sportsfoot/outcome.blade.php

@@ -207,29 +207,30 @@
                     console.log(data);
                     conttxt ='<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><div style="display: flex;"><li>主队全场角球:</li><input type="text" id="homeallcorner" name="homeallcorner" value="'+data.corner_ball.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球:</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.corner_ball.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球:</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.corner_ball.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球:</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.corner_ball.guest_half+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌:</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.penalty_card.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌:</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.penalty_card.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌:</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.penalty_card.home_half+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌:</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.penalty_card.guest_half+'" autocomplete="off"></div>';
                     if (data.newapp.home_score!=0 || data.newapp.guest_score!=0){
-                        conttxt += '<div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队:</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><div style="display: flex;"><li>最先进球球队:</li><select name="firstscore" id="firstscore">';
-                        if(data.first_score.teamscore!=0){
-                            conttxt += '<option value="'+ data.first_score.teamscore +'" selected="">'+data.first_score.teamscore+'</option><option value="">无最先进球</option>';
-                        }else{
-                            conttxt += '<option value="">请选择最先进球</option>';
-                        }
-                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
-
-                        conttxt += '<div style="display: flex;"><li>首球进球方式:</li><select name="firststye" id="firststye">';
-                        if(data.first_score.scoretype!=0){
-                            conttxt += '<option value="'+ data.first_score.scoretype +'" selected="">'+data.first_score.scoretype+'</option><option value="">无进球方式</option>';
-                        }else{
-                            conttxt += '<option value="">请选择进球方式</option>';
-                        }
-                        conttxt += '<option value="射门">射门</option><option value="头球">头球</option><option value="点球">点球</option><option value="任意球">任意球</option><option value="乌龙球">乌龙球</option></select></div>';
-
-                        conttxt += '<div style="display: flex;"><li>最后进球球队:</li><select name="lastscore" id="lastscore">';
-                        if(data.newapp.last_score!=0){
-                            conttxt += '<option value="'+ data.newapp.last_score +'" selected="">'+data.newapp.last_score+'</option><option value="">无最后进球</option>';
-                        }else{
-                            conttxt += '<option value="">请选择最后进球</option>';
-                        }
-                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
+                        conttxt += '<div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div>';
+//                        conttxt += '<div style="display: flex;"><li>首 进 球 时 间:</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队:</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><div style="display: flex;"><li>最先进球球队:</li><select name="firstscore" id="firstscore">';
+//                        if(data.first_score.teamscore!=0){
+//                            conttxt += '<option value="'+ data.first_score.teamscore +'" selected="">'+data.first_score.teamscore+'</option><option value="">无最先进球</option>';
+//                        }else{
+//                            conttxt += '<option value="">请选择最先进球</option>';
+//                        }
+//                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
+
+//                        conttxt += '<div style="display: flex;"><li>首球进球方式:</li><select name="firststye" id="firststye">';
+//                        if(data.first_score.scoretype!=0){
+//                            conttxt += '<option value="'+ data.first_score.scoretype +'" selected="">'+data.first_score.scoretype+'</option><option value="">无进球方式</option>';
+//                        }else{
+//                            conttxt += '<option value="">请选择进球方式</option>';
+//                        }
+//                        conttxt += '<option value="射门">射门</option><option value="头球">头球</option><option value="点球">点球</option><option value="任意球">任意球</option><option value="乌龙球">乌龙球</option></select></div>';
+//
+//                        conttxt += '<div style="display: flex;"><li>最后进球球队:</li><select name="lastscore" id="lastscore">';
+//                        if(data.newapp.last_score!=0){
+//                            conttxt += '<option value="'+ data.newapp.last_score +'" selected="">'+data.newapp.last_score+'</option><option value="">无最后进球</option>';
+//                        }else{
+//                            conttxt += '<option value="">请选择最后进球</option>';
+//                        }
+//                        conttxt += '<option value="'+ data.newapp.home_team +'">'+data.newapp.home_team+'</option><option value="'+ data.newapp.guest_team +'">'+data.newapp.guest_team+'</option></select></div>';
 
                     }
                     conttxt += '<div style="display: flex;"><li>上半场比分(主/客):</li><input style="width:50px;" type="text" id="homehalf" name="homehalf" value="'+data.newapp.u_home_score+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guesthalf" name="guesthalf" value="'+data.newapp.u_guest_score+'" autocomplete="off"></div><div style="display: flex;"><li style="margin-left:1.1rem;">全场比分(主/客):</li><input style="width:50px;" type="text" id="homeall" name="homeall" value="'+data.newapp.home_score+'" autocomplete="off">&nbsp;/&nbsp;<input style="width:50px;" type="text" id="guestall" name="guestall" value="'+data.newapp.guest_score+'" autocomplete="off"></div><br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button onclick="czClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
@@ -237,7 +238,7 @@
                 layerOpen = layer.open({
                   type: 1 //Page层类型
                   ,area: ['600px', '80%']
-                  ,title: '<h2>赛事结果添加<h2>'
+                  ,title: '<h2>赛事结果修改<h2>'
                   ,shade: 0.6 //遮罩透明度
                   ,maxmin: true //允许全屏最小化
                   ,anim: 1 //0-6的动画形式,-1不开启
@@ -280,14 +281,14 @@
                 success: function(data) {
                     var allnum = data.home_score+ data.guest_score;
 
-                    if(allnum>0){
-                        if(firstscore.length==0){
-                            alert("请输入最先进球");return;
-                        }
-                        if(lastscore.length==0){
-                            alert("请输入最后进球");return;
-                        }
-                    }
+//                    if(allnum>0){
+//                        if(firstscore.length==0){
+//                            alert("请输入最先进球");return;
+//                        }
+//                        if(lastscore.length==0){
+//                            alert("请输入最后进球");return;
+//                        }
+//                    }
 
                     $.ajax({
                             type: 'POST',

+ 12 - 1
sql.sql

@@ -18,4 +18,15 @@ ALTER TABLE st_wq_competition ADD COLUMN handle_mark varchar(100) COLLATE "pg_ca
 COMMENT ON COLUMN "st_wq_competition"."handle_mark" IS '处理备注(赛事取消/作废描述)';
 
 ALTER TABLE st_bq_competition ADD COLUMN handle_mark varchar(100) COLLATE "pg_catalog"."default";
-COMMENT ON COLUMN "st_bq_competition"."handle_mark" IS '处理备注(赛事取消/作废描述)';
+COMMENT ON COLUMN "st_bq_competition"."handle_mark" IS '处理备注(赛事取消/作废描述)';
+
+/**
+Tank.peng
+2019/11/1
+篮球结果表 新增 字段
+*/
+ALTER TABLE st_lq_result ADD COLUMN s_home_score int2 NOT NULL DEFAULT 0;
+COMMENT ON COLUMN "st_lq_result"."s_home_score" IS '下半场-主队进球数';
+
+ALTER TABLE st_lq_result ADD COLUMN s_guest_score int2 NOT NULL DEFAULT 0;
+COMMENT ON COLUMN "st_lq_result"."s_guest_score" IS '下半场-客队进球数';