异常处理

app/Http/Controllers/Admin/DemoController.php

@@ -30,6 +30,7 @@ class DemoController extends Controller {
 		$request['statuss'] = isset($req->statuss) ? trim($req->statuss) : null;
 		$request['cash_small'] = isset($req->cash_small) ? trim($req->cash_small) : null;
 		$request['cash_big'] = isset($req->cash_big) ? trim($req->cash_big) : null;
+        $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/demo/demo');
@@ -150,10 +151,12 @@ class DemoController extends Controller {
 		$statuss = Request::has('statuss') ? Request::get('statuss') : '';
 		$cash_small = Request::has('cash_small') ? Request::get('cash_small') : '';
 		$cash_big = Request::has('cash_big') ? Request::get('cash_big') : '';
-		$sureblur = Request::has('sureblur') ? Request::get('sureblur') : '';
+        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$where = array();
+
 		if (!empty($account)) {
-			if (empty($sureblur) || $sureblur == '模糊') {
+            $account = strtolower($account);
+			if (empty($sureblur) || $sureblur == 'off') {
 				$where[] = array('account', 'like', '%' . $account . '%');
 			} else {
 				$where[] = array('account', '=', $account);
@@ -174,7 +177,11 @@ class DemoController extends Controller {
 			$where[] = array('register_time', '<=', $regist_endtime);
 		}
 		if (!empty($statuss)) {
-			$where[] = array('statuss', '=', $statuss);
+		    if($statuss == 2){
+                $where[] = array('statuss', '!=', 1);
+            }else{
+                $where[] = array('statuss', '=', $statuss);
+            }
 		}
 		if (!empty($cash_small)) {
 			$where[] = array('cash', '>=', $cash_small);
@@ -182,7 +189,6 @@ class DemoController extends Controller {
 		if (!empty($cash_big)) {
 			$where[] = array('cash', '<=', $cash_big);
 		}
-
 		$db = new \App\Models\Account;
 		$data = $db->demo_account($list, $page, $where);
 		if (!($data < 0)&&is_array($data)&&count($data)>0&&is_array($data['data'])&&count($data['data'])>0) {

app/Http/Controllers/Admin/MoneyController.php

@@ -187,6 +187,8 @@ class MoneyController extends Controller
         $field = Request::has('field') ? Request::get('field') : 6;
         $order = Request::has('order') ? Request::get('order') : 'desc';
 
+        $field = $field == 'change_cash' ? 'money_details.money' : $field;
+
         $account_name = Request::has('account_name') ? Request::get('account_name') : '';
         $order_id = Request::has('order_id') ? Request::get('order_id') : '';
         $trade_type = Request::has('trade_type') ? Request::get('trade_type') : '';
@@ -224,10 +226,10 @@ class MoneyController extends Controller
             $where[] = array('money_time', '<=', $end_time);
         }
         if (!empty($money_small)) {
-            $where[] = array('money', '>=', $money_small);
+            $where[] = array('money_details.money', '>=', $money_small);
         }
         if (!empty($money_big)) {
-            $where[] = array('money', '<=', $money_big);
+            $where[] = array('money_details.money', '<=', $money_big);
         }
         if (!empty($order_id)) {
             $where = array(array('trade_id', '=', $order_id));

app/Http/Controllers/Admin/MoneyListController.php

@@ -29,7 +29,7 @@ class MoneyListController extends Controller {
 		$dt->setLang('money');
 		$dt->setPriKey('trade_id');
 		$dt->addColsFields('id', array('width' => 80));
-		$dt->addColsFields('account_name', array('templet' => '#usermoneyRecord', 'width' => 110));
+		/*$dt->addColsFields('account_name', array('templet' => '#usermoneyRecord', 'width' => 110));*/
 		$dt->addColsFields('money_time', array('templet' => '#orderid_time','width' => 240));
 		$dt->addColsFields('change_cash', array('templet' => '#money_aftercash','width' => 290));
 		$dt->addColsFields('systemuser_ordertype', array('templet' => '#systemuser_ordertype','sort'=>false,'width' => 160));

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -336,7 +336,7 @@ class SoccerStringNoteListController extends Controller
     }
 
     /**
-     * 投注金额统计
+     * 投注金额统计 1
      */
     function moneycount()
     {

app/Http/Controllers/Admin/SportsbkController.php

@@ -289,9 +289,21 @@ class SportsbkController extends Controller {
 		$status = 2;
 		//追加判断比分 如果都== -1，则作废该赛事
 		if($guestscore[1] < 0 and $guestscore[2] < 0 and $guestscore[3] < 0 and $guestscore[4] < 0 and $homescore[1] < 0 and $homescore[2] < 0 and $homescore[3] < 0 and $homescore[4] < 0 ){
-			//如果赛事已结算，不可作废
+			//已结算作废赛事处理
 			if($match_status == 3){
-				return responseToJson(-20002);
+				$url = 'http://stadmin.bocai108.com:9094/UnSettelement';
+				$data_up = [
+					'token'=>session('adminInfo.token'),
+					'game_code'=>'lq',
+					'match_id'=>$match_id,
+				];
+				$ret_json = commonFunction::https_request($url,$data_up);
+				// $ret_json = '{"status":1,"msg":"撤销成功!2019-10-26 16:28:30 取消赛事处理--结束end：game_code= zq  match_id= 40986 \n","data":[]}';
+
+				$ret_arr = json_decode($ret_json,true);
+				if($ret_arr['status'] != 1){
+					return responseToJson(-20003);
+				}
 			}
 			//赛事下单式注单作废，串关注单下此赛事按平局处理
 			$upapp = new \App\Models\SportsNoteList();
@@ -303,9 +315,9 @@ class SportsbkController extends Controller {
 		$addnew->addcomendnotice($match_id,'lq');
 
 		$twoapp = new \App\Models\SportsBasket();
-		$twoapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改赛事状态
+		$twoapp->updatestatus('match_id',$match_id,['status'=>$status,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
 		$newapp = new \App\Models\Stlqresult();
-		$newapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改结果状态
+		$newapp->updatestatus('match_id',$match_id,['status'=>$status,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
         //添加赛事结果比较记录
         $lastLog = \App\Models\Stlqresultlog::where([

app/Http/Controllers/Admin/SportsbqController.php

@@ -305,9 +305,21 @@ class SportsbqController extends Controller {
 		$status = 2;
 		//追加判断比分 如果都== -1，则作废该赛事
 		if($data['u_home_score'] < 0 and $data['u_guest_score'] < 0 and $data['home_score'] < 0 and $data['guest_score'] < 0){
-			//如果赛事已结算，不可作废
+			//已结算作废赛事处理
 			if($match_status == 3){
-				return responseToJson(-20002);
+				$url = 'http://stadmin.bocai108.com:9094/UnSettelement';
+				$data_up = [
+					'token'=>session('adminInfo.token'),
+					'game_code'=>'bq',
+					'match_id'=>$match_id,
+				];
+				$ret_json = commonFunction::https_request($url,$data_up);
+				// $ret_json = '{"status":1,"msg":"撤销成功!2019-10-26 16:28:30 取消赛事处理--结束end：game_code= zq  match_id= 40986 \n","data":[]}';
+
+				$ret_arr = json_decode($ret_json,true);
+				if($ret_arr['status'] != 1){
+					return responseToJson(-20003);
+				}
 			}
 			//赛事下单式注单作废，串关注单下此赛事按平局处理
 			$upapp = new \App\Models\SportsNoteList();
@@ -321,8 +333,8 @@ class SportsbqController extends Controller {
 		$addnew->addcomendnotice($match_id,'bq');
 
 		$twoapp = new \App\Models\SportsBase();
-		$twoapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改赛事状态
-		$newapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改结果状态
+		$twoapp->updatestatus('match_id',$match_id,['status'=>$status,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+		$newapp->updatestatus('match_id',$match_id,['status'=>$status,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
         //添加赛事结果比较记录
         $lastLog = \App\Models\Stbqresultlog::where([

app/Http/Controllers/Admin/SportsfootController.php

@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\DB;
 Use App\Lib\Settlement\SettlementOrder;
 use App\Models;
 use Request;
+use App\Lib\Biz\Sport\Common as commonFunction;
 
 /**
  *足球结算
@@ -819,9 +820,21 @@ class SportsfootController extends Controller {
 		$status = 2;
 		//追加判断比分 如果都== -1，则作废该赛事
 		if($data['u_home_score'] < 0 and $data['u_guest_score'] < 0 and $data['home_score'] < 0 and $data['guest_score'] < 0){
-			//如果赛事已结算，不可作废
+			//已结算作废赛事处理
 			if($match_status == 3){
-				return responseToJson(-20002);
+				$url = 'http://stadmin.bocai108.com:9094/UnSettelement';
+				$data_up = [
+					'token'=>session('adminInfo.token'),
+					'game_code'=>'zq',
+					'match_id'=>$match_id,
+				];
+				$ret_json = commonFunction::https_request($url,$data_up);
+				// $ret_json = '{"status":1,"msg":"撤销成功!2019-10-26 16:28:30 取消赛事处理--结束end：game_code= zq  match_id= 40986 \n","data":[]}';
+
+				$ret_arr = json_decode($ret_json,true);
+				if($ret_arr['status'] != 1){
+					return responseToJson(-20003);
+				}
 			}
 			//赛事下单式注单作废，串关注单下此赛事按平局处理
 			$upapp = new \App\Models\SportsNoteList();
@@ -835,8 +848,8 @@ class SportsfootController extends Controller {
 		$update = $this->addcomendnotice($match_id);
 
 		$twoapp = new \App\Models\SportsSoccer();
-		$twoapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改赛事状态
-		$newapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改结果状态
+		$twoapp->updatestatus('match_id',$match_id,['status'=>$status,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+		$newapp->updatestatus('match_id',$match_id,['status'=>$status,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
         //添加赛事结果比较记录
         $lastLog = \App\Models\Stzqresultlog::where([

app/Http/Controllers/Admin/SportswqController.php

@@ -296,9 +296,21 @@ class SportswqController extends Controller {
 		$status = 2;
 		//追加判断比分 如果都== -1，则作废该赛事
 		if($req->home_player_score < 0 and $req->guest_player_score < 0 ){
-			//如果赛事已结算，不可作废
+			//已结算作废赛事处理
 			if($match_status == 3){
-				return responseToJson(-20002);
+				$url = 'http://stadmin.bocai108.com:9094/UnSettelement';
+				$data_up = [
+					'token'=>session('adminInfo.token'),
+					'game_code'=>'zq',
+					'match_id'=>$match_id,
+				];
+				$ret_json = commonFunction::https_request($url,$data_up);
+				// $ret_json = '{"status":1,"msg":"撤销成功!2019-10-26 16:28:30 取消赛事处理--结束end：game_code= zq  match_id= 40986 \n","data":[]}';
+
+				$ret_arr = json_decode($ret_json,true);
+				if($ret_arr['status'] != 1){
+					return responseToJson(-20003);
+				}
 			}
 			//赛事下单式注单作废，串关注单下此赛事按平局处理
 			$upapp = new \App\Models\SportsNoteList();
@@ -310,9 +322,9 @@ class SportswqController extends Controller {
 		$addnew->addcomendnotice($match_id,'wq');
 
 		$twoapp = new \App\Models\SportsBasket();
-		$twoapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改赛事状态
+		$twoapp->updatestatus('match_id',$match_id,['status'=>$status,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
 		$newapp = new \App\Models\Stwqresult();
-		$newapp->updatestatus('match_id',$match_id,['status'=>$status]);//修改结果状态
+		$newapp->updatestatus('match_id',$match_id,['status'=>$status,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 
         //添加赛事结果比较记录
         $lastLog = \App\Models\Stwqresultlog::where([

app/Lib/Biz/Sport/Common.php

@@ -1330,6 +1330,27 @@ class Common
     }
 
 
+    //http 请求
+    public static function https_request($curl, $data=null, $https=true, $method='post'){
+        $ch = curl_init();//初始化
+        curl_setopt($ch, CURLOPT_URL, $curl);//设置访问的URL
+        curl_setopt($ch, CURLOPT_HEADER, false);//设置不需要头信息
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);//只获取页面内容，但不输出
+        if($https){
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);//不做服务器认证
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);//不做客户端认证
+        }
+        if($method == 'post'){
+            curl_setopt($ch, CURLOPT_POST, true);//设置请求是POST方式
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);//设置POST请求的数据
+        }
+        $str = curl_exec($ch);//执行访问，返回结果
+        curl_close($ch);//关闭curl，释放资源
+        return $str;
+    }
+
+
+
 }
 
 ?>

app/Models/MoneyBuyStr.php

@@ -142,21 +142,9 @@ class MoneyBuyStr extends BaseModel
                 $data[$i]->game_status = '未中奖';
             }
 
-            //$str_type = str_replace('*', '串', $data[$i]->str_type);
-            $tmp_arr_set = [
-                '1' => '未结算',
-                '2' => '已结算',
-            ];
-            $tmp_arr_win = [
-                '0' => '待开奖',
-                '1' => '中奖',
-                '2' => '未开奖',
-                '3' => '未中奖',
-            ];
-
+            $str_type = str_replace('*', '串', $data[$i]->str_type);
             $mun = explode('串', $data[$i]->str_type);
-            $dword = $data[$i]->game_status . ' [<a class="detail" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/detail/?id=" href="/admin/SoccerStringNoteList/detail/?id=' . $data[$i]->id . '"> 详情 </a>]';
-            $data[$i]->detail_content = $dword;
+            $data[$i]->detail_content  = $data[$i]->game_status . ' [<a class="detail" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/detail/?id=" href="/admin/SoccerStringNoteList/detail/?id=' . $data[$i]->id . '"> 详情 </a>]';
             //$data[$i]->detail_content = $data[$i]->settle_status.':'.$mun[0].' [<a class="detail" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/detail/?id=" href="/admin/SoccerStringNoteList/detail/?id='.$data[$i]->id.'"> 详情 </a>]';
             $data[$i]->str_type = $data[$i]->str_type . '<br>(<span>' . $data[$i]->account_name . '</span>)';
 

resources/lang/zh-cn/error.php

@@ -427,4 +427,5 @@ return [
      * 赛事作废
      */
     '-20002' => '赛事已结算，不能进行作废操作',
+    '-20003' => '已结算赛事，作废操作失败',
 ];

resources/lang/zh-cn/status.php

@@ -69,7 +69,7 @@ return array(
 			'8' => '回水',
 			'9' => '管理员扣款',
 			'10' => '佣金提成',
-			'11' => '后台充值',
+			'11' => '后台加款',
 			'12' => '活动',
 			'13' => '充值赠送',
 			'14' => '汇款',

resources/views/admin/demo/demos.blade.php

@@ -52,9 +52,9 @@
 	  <a href="/admin/user/view?account=@{{d.account}}">@{{ d.account}}</a>
 	</script>--}}
 
-	<script type="text/html" id="moneyrecord">
+	{{--<script type="text/html" id="moneyrecord">
 	  <a href="/admin/fund/index?isuser=1&account_name=@{{d.account}}&star_time=&end_time=">查看财务</a><br>@{{ d.cash}}<input type="hidden" id="curpage_cash" value="@{{d.pagecash}}" />
-	</script>
+	</script>--}}
 
     <div class="layui-row">
 
@@ -69,7 +69,8 @@
 							<input type="text" name="account" id="form_account" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $account }}">
 						</div>
 						<div class="layui-input-inline checkbox">
-                            <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" checked eventType=event-query>
+                            <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
+                            <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
                         </div>
 
                     </div>
@@ -153,6 +154,21 @@
             </form>
         </div>
     </div>
+
+    <script>
+        $(function () {
+            $('body').on('click','#form_sureblur~.layui-form-switch',function(){
+                var sus = $('#form_sureblur').next().text();
+                if(sus=='精确'){
+                    $('#form_sureblurs').val('on');
+                }else{
+                    $('#form_sureblurs').val('off');
+                }
+            })
+        });
+
+    </script>
+
 @push('dataTableJS')
 /*var active = {
     reload: function(){

resources/views/admin/moneylist/index.blade.php

@@ -152,7 +152,7 @@
     </script>
 
     <script type="text/html" id="game">
-        <a href="/admin/MoneyList/view?order_id=@{{d.trade_id}}" class="layui-btn layui-btn-sm" style="margin-bottom:5px;margin-left:0px;">查看</a
+        <a href="/admin/MoneyList/view?order_id=@{{d.trade_id}}" class="layui-btn layui-btn-sm" style="margin-bottom:5px;margin-left:0px;">查看详细信息</a>
     </script>
 <div class="layui-row">
 
@@ -160,7 +160,7 @@
 
 		<form class="layui-form rewrite" action="" eventType=eventForm>
             <div class="layui-form-item">
-                <div class="layui-inline">
+                <div class="layui-inline" style="display: none">
 					<label class="layui-form-label">{{ trans('money.account_name') }}</label>
 					<div class="layui-input-inline">
 						<input type="text" name="account_name" id="form_account_name" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $account_name }}">
@@ -236,9 +236,8 @@
                 <div class="layui-inline">
                 <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;" eventType=event-query-submit>提交</a>
 				<a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                <!-- <i class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
                 <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
-                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)">返回</a>
+                <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)">返回</a>
 
                </div>
 
@@ -275,9 +274,12 @@ $('.lay-btn-diy').on('click', function(){
 
   //重置表单
   $('.reset').on('click',function(){
+      let account_name = $("#form_account_name").val();
 	  $('input').val('');
 	  $('#form_trade_type').val('');
 	  $('#form_status').val('');
+
+      $("#form_account_name").val(account_name);
 	  //var type = $(this).data('type');
 	  //active[type] ? active[type].call(this) : '';
   });