异常处理

app/Http/Controllers/Admin/CheckRollingController.php

@@ -222,7 +222,7 @@ class CheckRollingController extends Controller
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
-        $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
+        // $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
         $dt->addColsFields('roll_ratify', array('sort' => false, 'width' => 90));
         //$arr[] = 'view';

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -5,6 +5,7 @@
  * Date: 2019/4/9
  * Time: 9:11
  */
+
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
@@ -25,10 +26,10 @@ class SoccerStringNoteListController extends Controller
     {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
-        $request['account'] = isset($req->account) ? trim($req->account) :null ;
-        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
-        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
-        $request['order_id'] = isset($req->order_id) ? trim($req->order_id) :null ;
+        $request['account'] = isset($req->account) ? trim($req->account) : null;
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) : null;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : null;
+        $request['order_id'] = isset($req->order_id) ? trim($req->order_id) : null;
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['match_id'] = isset($req->match_id) ? trim($req->match_id) : '';
         $request['game_code'] = isset($req->game_code) ? trim($req->game_code) : '';
@@ -48,12 +49,13 @@ class SoccerStringNoteListController extends Controller
         $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 140));
         $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 230));
-        // $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
-//        if (checkRriv('/admin/SoccerStringNoteList/edit')) {
-//            $arr[] ='edit';
-//        }
-//        $dt->setToolBar($arr, array('width' => 100));
-        $dt->enableCheckBox();
+        $dt->addColsFields('myoption', array('templet' => '#myoption', 'sort' => false, 'title' => '操作', 'width' => 230));
+        //$dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
+        //if (checkRriv('/admin/SoccerStringNoteList/edit')) {
+        //    $arr[] ='edit';
+        // }
+        //$dt->setToolBar($arr, array('width' => 100));
+        //$dt->enableCheckBox();
         return view('sports/sports_stringnotelist', $dt->render($request));
     }
 
@@ -62,8 +64,8 @@ class SoccerStringNoteListController extends Controller
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
         $account = Request::get('account') ? Request::get('account') : '';
-        $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
-        $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
+        $star_time = Request::get('star_time') ? Request::get('star_time') . ' 00:00:00' : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time') . ' 23:59:59' : '';
         $order_id = Request::get('order_id') ? Request::get('order_id') : '';
         $match_id = Request::get('match_id') ? Request::get('match_id') : '';
         $status = Request::has('status') ? Request::get('status') : '';
@@ -80,46 +82,46 @@ class SoccerStringNoteListController extends Controller
             }
         }
         if (!empty($star_time)) {
-            if (!empty($end_time)){
+            if (!empty($end_time)) {
                 $where[] = array('money_buy_str.money_time', '>', $star_time);
                 $where[] = array('money_buy_str.money_time', '<', $end_time);
-            }else{
+            } else {
                 $where[] = array('money_buy_str.money_time', '>', $star_time);
             }
-        }else if(empty($star_time)){
-            if (!empty($end_time)){
+        } else if (empty($star_time)) {
+            if (!empty($end_time)) {
 
                 $where[] = array('money_buy_str.money_time', '<', $end_time);
             }
         }
-        if (!empty($order_id)){
+        if (!empty($order_id)) {
             $where[] = array('money_buy_str.order_id', $order_id);
         }
 
         $ids = array();
-        if(!empty($match_id)){
+        if (!empty($match_id)) {
             $allcs = new \App\Models\MoneyBuyMatch();
-            $csorder = $allcs->allstrorder($match_id,$game_code);
-            if(!empty($csorder)){
-                for($i=0;$i<count($csorder);$i++){
+            $csorder = $allcs->allstrorder($match_id, $game_code);
+            if (!empty($csorder)) {
+                for ($i = 0; $i < count($csorder); $i++) {
                     $ids[] = $csorder[$i]['order_id'];
                 }
-            }else{
+            } else {
                 return \App\Lib\DataTable\DataTable::init()->toJson([]);
             }
         }
-        
+
         //调整状态查询 1,2,3为订单状态 1投注 2作废 3撤单
-        if($order_status == 1 || $order_status == 2 || $order_status == 3){
+        if ($order_status == 1 || $order_status == 2 || $order_status == 3) {
             $where[] = array('money_buy_str.status', '=', $order_status);
         }
         //4 5为结算状态 4未结算 5已结算
-        if($order_status == 4){
-            $status  = 1;
+        if ($order_status == 4) {
+            $status = 1;
             $where[] = array('money_buy_str.settle_status', '=', $status);
         }
-        if($order_status == 5){
-            $status  = 2;
+        if ($order_status == 5) {
+            $status = 2;
             $where[] = array('money_buy_str.settle_status', '=', $status);
         }
 
@@ -134,7 +136,7 @@ class SoccerStringNoteListController extends Controller
         }
         */
         $newapp = new \App\Models\MoneyBuyStr();
-        $data = $newapp->getinfo($list, $page, $where,$ids);
+        $data = $newapp->getinfo($list, $page, $where, $ids);
 
 
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
@@ -143,14 +145,15 @@ class SoccerStringNoteListController extends Controller
     /**
      *串关注单详情
      */
-    function detail(Req $req) {
+    function detail(Req $req)
+    {
         $id = $req->id;
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
-        $request['account'] = isset($req->account) ? trim($req->account) :null ;
-        $request['match_id'] = isset($req->match_id) ? trim($req->match_id) :null ;
+        $request['account'] = isset($req->account) ? trim($req->account) : null;
+        $request['match_id'] = isset($req->match_id) ? trim($req->match_id) : null;
         $dt = \App\Lib\DataTable\DataTable::init();
-        $dt->setDataSource('/admin/SoccerStringNoteList/detailinfo?id='.$id.'');
+        $dt->setDataSource('/admin/SoccerStringNoteList/detailinfo?id=' . $id . '');
         $dt->setLang('sportsnotelist');
         $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
@@ -163,7 +166,9 @@ class SoccerStringNoteListController extends Controller
         //$dt->enableCheckBox();
         return view('sports/sports_notelistdetail', $dt->render($request));
     }
-    function detailinfo(Req $req) {
+
+    function detailinfo(Req $req)
+    {
         $id = $req->id;
 
         $newapp = new \App\Models\MoneyBuyStr();
@@ -184,30 +189,30 @@ class SoccerStringNoteListController extends Controller
             return -1;
         }
         //return 1;
-        $order = \App\Models\MoneyBuyStr::where('id',$id)->first();
+        $order = \App\Models\MoneyBuyStr::where('id', $id)->first();
         //用戶账户金额
-        $account_money = \App\Models\Account_detailed::where('account_identity',$order->account_identity)->first();
+        $account_money = \App\Models\Account_detailed::where('account_identity', $order->account_identity)->first();
         //反水
-        $water_return_money = \App\Models\Money_details::where('trade_id',$order->order_id)->where('trade_type','7')->first();
-        if(!empty($water_return_money)){
+        $water_return_money = \App\Models\Money_details::where('trade_id', $order->order_id)->where('trade_type', '7')->first();
+        if (!empty($water_return_money)) {
             $water_return = $water_return_money->money;
-        }else{
+        } else {
             $water_return = 0;
         }
         //撤单后用户账户金额
         $available_cash = $account_money->available_cash;
-        $new_available_cash = $available_cash+$order->money-$order->gain_money-$water_return;
+        $new_available_cash = $available_cash + $order->money - $order->gain_money - $water_return;
 
-        $model =new \App\Models\Money_details();
+        $model = new \App\Models\Money_details();
         $model->info_identity = UUID();
         $model->trade_id = $order->order_id;
         $model->account_name = $order->account_name;
         $model->account_identity = $order->account_identity;
-        $model->money = abs($order->money-$order->gain_money-$water_return);
-        $model->money_time = date("Y-m-d H:i:s",time());
-        if($new_available_cash>$available_cash){
+        $model->money = abs($order->money - $order->gain_money - $water_return);
+        $model->money_time = date("Y-m-d H:i:s", time());
+        if ($new_available_cash > $available_cash) {
             $model->money_type = '1';
-        }else{
+        } else {
             $model->money_type = '2';
         }
         $model->money_cash = $new_available_cash;
@@ -216,8 +221,8 @@ class SoccerStringNoteListController extends Controller
         $model->status = '1';
         try {
             DB::beginTransaction();//开启事务
-            \App\Models\MoneyBuyStr::where('id',$id)->update(['status'=>'2','gain_money'=>'0','use_mark'=>$reason]);
-            \App\Models\Account_detailed::where('account_identity',$order->account_identity)->update(['available_cash'=>$new_available_cash,'cash'=>$new_available_cash]);
+            \App\Models\MoneyBuyStr::where('id', $id)->update(['status' => '2', 'gain_money' => '0', 'use_mark' => $reason]);
+            \App\Models\Account_detailed::where('account_identity', $order->account_identity)->update(['available_cash' => $new_available_cash, 'cash' => $new_available_cash]);
             $model->save();
             DB::commit();//提交
             return 1;
@@ -239,10 +244,10 @@ class SoccerStringNoteListController extends Controller
             return -1;
         }
         $order = \App\Models\MoneyBuyStr::where('id', $id)->first();
-        $match = \App\Models\MoneyBuyMatch::where('batch_id',$order->batch_id)->where('bet_type','2')->get();
+        $match = \App\Models\MoneyBuyMatch::where('batch_id', $order->batch_id)->where('bet_type', '2')->get();
         $bet_type = 2; //串关注单
         $order_id = $order->order_id;
-        for($i=0;$i<count($match);$i++){
+        for ($i = 0; $i < count($match); $i++) {
             $match_id = $match[$i]->match_id;
             $game_code = $match[$i]->game_code;
             //判断输赢
@@ -255,23 +260,24 @@ class SoccerStringNoteListController extends Controller
         //结算
         $SettlementOrder = new SettlementOrder();
         $settype = 1; //首次结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
+        $data = $SettlementOrder->reSettlement($order_ids, $bet_type, $settype, $game_code, $match_id, $match_status = 0);
         return $data;
     }
 
     /**
      *串关注单重新结算
      */
-    public function resettlement(Req $req) {
+    public function resettlement(Req $req)
+    {
         $id = $req->id;
         if (intval($id) < 1) {
             return -1;
         }
-        $order = \App\Models\MoneyBuyStr::where('id',$id)->first();
-        $match = \App\Models\MoneyBuyMatch::where('batch_id',$order->batch_id)->where('bet_type','2')->get();
+        $order = \App\Models\MoneyBuyStr::where('id', $id)->first();
+        $match = \App\Models\MoneyBuyMatch::where('batch_id', $order->batch_id)->where('bet_type', '2')->get();
         $bet_type = 2; //串关注单
         $order_id = $order->order_id;
-        for($i=0;$i<count($match);$i++){
+        for ($i = 0; $i < count($match); $i++) {
             $match_id = $match[$i]->match_id;
             $game_code = $match[$i]->game_code;
             //判断输赢
@@ -283,37 +289,57 @@ class SoccerStringNoteListController extends Controller
         //重新结算
         $SettlementOrder = new SettlementOrder();
         $settype = 2; //重新结算
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type,$settype,$game_code,$match_id,$match_status=0);
-        return  $data;
+        $data = $SettlementOrder->reSettlement($order_ids, $bet_type, $settype, $game_code, $match_id, $match_status = 0);
+        return $data;
     }
 
     /**
      *串关注单批量结算
      */
-    public function batchsettlement(){
+    public function batchsettlement()
+    {
         $bet_type = 2; //串关注单
-        $orders = \App\Models\MoneyBuyStr::where('settle_status','1')->get();
+        $orders = \App\Models\MoneyBuyStr::where('settle_status', '1')->get();
         $order_ids = array();
-        for($i=0;$i<count($orders);$i++){
-            $result = \App\Models\MoneyBuyMatch::where('batch_id',$orders[$i]->batch_id)->get();
+        for ($i = 0; $i < count($orders); $i++) {
+            $result = \App\Models\MoneyBuyMatch::where('batch_id', $orders[$i]->batch_id)->get();
             $res = array();
-            for($j=0;$j<count($result);$j++){
+            for ($j = 0; $j < count($result); $j++) {
                 $res[] = $result[$j]->result;
             }
-            if(!in_array(0,$res)){
+            if (!in_array(0, $res)) {
                 $order_ids[] = $orders[$i]->order_id;
             }
         }
         //return $order_id;
         $SettlementOrder = new SettlementOrder();
-        $data = $SettlementOrder->reSettlement($order_ids,$bet_type);
+        $data = $SettlementOrder->reSettlement($order_ids, $bet_type);
         return $data;
     }
 
+    //撤销某个串个订单,参数单号
+    public function RevokeStrOrder(Req $req)
+    {
+        $order_id = $req->input('order_id');
+        if (empty($id)) {
+            return responseToJson(-2001);
+        }
+
+        $data = [
+            'token' => session('adminInfo.token'),
+            'order_ids' => $order_id,
+        ];
+        $ret = $this->request_post(config('sconstant.url') . '/UnsetOneStringOrder', $data);
+        return json_decode($ret, true);
+
+    }
+
+
     /**
      *删除串关注单
      */
-    public function delete(Req $req) {
+    public function delete(Req $req)
+    {
         $id = $req->input('id');
         if (empty($id)) {
             return responseToJson(-2001); //id������
@@ -348,7 +374,7 @@ class SoccerStringNoteListController extends Controller
 
         $db = new \App\Models\MoneyBuyStr();
 
-        $data = $db->MoneyCount($where,$match_id,$game_code);
+        $data = $db->MoneyCount($where, $match_id, $game_code);
         return responseToJson($data);
     }
 
@@ -357,7 +383,7 @@ class SoccerStringNoteListController extends Controller
     {
         $order_id = isset($req->order_id) ? $req->order_id : 0;
         //$model = new  \App\Models\SportsNoteList();
-        $ret = \App\Models\MoneyBuyStr::where('order_id',$order_id)->first();
+        $ret = \App\Models\MoneyBuyStr::where('order_id', $order_id)->first();
         //return $ret;
         if ($ret) {
             return responseToJson(1, '成功', $ret);

resources/views/sports/sports_stringnotelist.blade.php

@@ -68,10 +68,17 @@
         }
     </style>
 
+
     <script type="text/html" id="status">
         @if(checkRriv('/admin/SportsSoccer/score'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
     </script>
 
+    <script type="text/html" id="myoption">
+        @{{#if(d.status==1){ }}
+        <button onclick="invalid('/admin/SoccerStringNoteList/RevokeStrOrder','@{{d.order_id}}')" class="layui-btn layui-btn-sm settlement">撤单</button>
+        @{{#} }}
+    </script>
+
     <div class="layui-row">
         <div class="layui-col-xs12">
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
@@ -129,7 +136,7 @@
                         </div>
                     </div>
                     -->
-                    
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.order_status') }}</label>
                         <div class="layui-input-inline" style="width: 100px">
@@ -383,16 +390,13 @@
                         content: content, //这里content是一个DOM，注意：最好该元素要存放在body最外层，否则可能被其它的相对元素所影响,
                         btn: ['提交', '取消'],
                         yes: function(index, layero){
-
-                            reason = $("#reason" + id).val();
-                            //console.log(reason);
                             // 请求设置接口
-                            //console.log(url);
+                            console.log(url,order_id);
                             $.ajax({
                                 type: 'get',
                                 //dataType: 'json',
                                 url: url,
-                                data: {'reason': reason},
+                                data: {'order_id': order_id},
                                 success: function(res) {
                                     //console.log(res);
                                     if (1 == res) {