异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -300,10 +300,12 @@ class SoccerNoteListController extends Controller
         //4 5为结算状态 4未结算 5已结算
         if ($order_status == 4) {
             $status = 1;
+            $where[] = array('money_buy_simplex.status', '=',1);
             $where[] = array('money_buy_simplex.settle_status', '=', $status);
         }
         if ($order_status == 5) {
             $status = 2;
+            $where[] = array('money_buy_simplex.status', '=',1);
             $where[] = array('money_buy_simplex.settle_status', '=', $status);
         }
         /*
@@ -640,10 +642,12 @@ class SoccerNoteListController extends Controller
         //4 5为结算状态 4未结算 5已结算
         if ($order_status == 4) {
             $status = 1;
+            $where[] = array('money_buy_simplex.status', '=',1);
             $where[] = array('money_buy_simplex.settle_status', '=', $status);
         }
         if ($order_status == 5) {
             $status = 2;
+            $where[] = array('money_buy_simplex.status', '=', 1);
             $where[] = array('money_buy_simplex.settle_status', '=', $status);
         }
 
@@ -1222,7 +1226,6 @@ class SoccerNoteListController extends Controller
             'token' => session('adminInfo.token'),    //外网
             'order_id' => $order_id,
         ];
-        dd(config('sconstant.url') . '/DoWinFailOneOrder');
         $ret = $this->request_post(config('sconstant.url') . '/DoWinFailOneOrder', $data);
         return json_decode($ret, true);
     }

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -98,8 +98,6 @@ class SoccerStringNoteListController extends Controller
     }
 
 
-
-
     function info()
     {
         $page = Request::has('page') ? Request::get('page') : '';
@@ -275,6 +273,35 @@ class SoccerStringNoteListController extends Controller
 
     }
 
+    public function resetStrOrder(Req $req)
+    {
+        return ['status'=>-1,'msg'=>'功能废弃'];
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return ['status'=>-1,'msg'=>'无效id'];
+        }
+        $order = \App\Models\MoneyBuyStr::where('id', $id)->first();
+        if (empty($order)){
+            return ['status'=>-2,'msg'=>'订单不存在'];
+        }
+        if ($order->status==1){
+            return ['status'=>-3,'msg'=>'状态错误'];
+        }
+
+        $order->status =1 ;
+        $order->settle_status =1 ;
+        $order->game_status = 0;
+        $ret = $order->save();
+
+        if ($ret){
+            return ['status'=>1,'msg'=>'更新成功'];
+        }else{
+            return ['status'=>-4,'msg'=>'更新失败'];
+        }
+
+    }
+
+
     /**
      *串关注单首次结算
      */

app/Models/SportsNoteList.php

@@ -1336,12 +1336,12 @@ class SportsNoteList extends BaseModel
                 foreach($orders as $kk=>$vv){
                     if($v['account_identity'] == $vv['account_identity']){
                         if($account_money == 0){
-                            $vv['available_cash'] = $v['available_cash'];
+                            $vv['available_cash'] = $v['available_cash']+$vv['money']-$vv['money']-$vv['gain_money'];
                             //当前注单退款后的余额
-                            $account_money = $v['available_cash']+$vv['money']-$vv['money']-$vv['gain_money'];
+                            $account_money = $vv['available_cash'];
                         }else{//其他 获取 上个注单处理后的余额
-                            $vv['available_cash'] = $account_money;
-                            $account_money = $account_money+$vv['money']-$vv['money']-$vv['gain_money'];
+                            $vv['available_cash'] = $account_money+$vv['money']-$vv['money']-$vv['gain_money'];
+                            $account_money = $vv['available_cash'];
                         }
                     }
                 }
@@ -1444,22 +1444,22 @@ class SportsNoteList extends BaseModel
                     if($v['account_identity'] == $vv['account_identity']){
                         if($vv['status'] == 1 && $vv['settle_status'] == 2 && $vv['result'] != -1 && $vv['result'] != 0) {
                             if ($account_money == 0) {
-                                $vv['available_cash'] = $v['available_cash'];
+                                $vv['available_cash'] = $v['available_cash'] - $vv['gain_money'];
                                 //当前注单状态改变后的余额
-                                $account_money = $v['available_cash'] - $vv['gain_money'];
+                                $account_money = $vv['available_cash'];
                             } else {//其他 获取 上个注单处理后的余额
-                                $vv['available_cash'] = $account_money;
-                                $account_money = $account_money - $vv['gain_money'];
+                                $vv['available_cash'] = $account_money - $vv['gain_money'];
+                                $account_money = $vv['available_cash'];
                             }
                         }
                         if($vv['status'] == 2 || $vv['status'] == 3){
                             if ($account_money == 0) {
-                                $vv['available_cash'] = $v['available_cash'];
+                                $vv['available_cash'] = $v['available_cash'] - $vv['money'] + $vv['return_money'];
                                 //当前注单状态改变后的余额
-                                $account_money = $v['available_cash'] - $vv['money'] + $vv['return_money'];
+                                $account_money = $vv['available_cash'];
                             } else {//其他 获取 上个注单处理后的余额
-                                $vv['available_cash'] = $account_money;
-                                $account_money = $account_money - $vv['money'] + $vv['return_money'];
+                                $vv['available_cash'] = $account_money - $vv['money'] + $vv['return_money'];
+                                $account_money = $vv['available_cash'];
                             }
                         }
                     }

resources/views/sports/sports_stringnotelistSet.blade.php

@@ -78,6 +78,8 @@
         <button onclick="invalid('/admin/SoccerStringNoteList/RevokeStrOrder','@{{d.order_id}}')" class="layui-btn layui-btn-sm settlement">作废</button><br/>
         <button onclick="settlement('/admin/SoccerStringNoteList/resettlement','@{{d.id}}')" class="layui-btn layui-btn-sm">结算</button>
         @{{#} }}
+
+
     </script>
 
     <div class="layui-row">
@@ -308,6 +310,29 @@
 
             });
         }
+
+
+        //把已作废的串式单改为未结算状态
+        function  resetNoset(url,id){
+            layer.confirm('是否重新设置订单状态为未结算状态？', {
+                btn: ['确认', '取消'] //按钮
+            }, function() {
+                $.getJSON(url,{id:id}, function(data) {
+                    //console.log(data);
+                    if (data.status == '1') {
+                        layer.msg('操作成功');
+                        reloadDataTable();
+                    } else {
+                        layer.msg(data.msg);
+                    }
+                });
+            }, function() {
+
+            });
+
+        }
+
+
         //重新结算
         function resettlement(url) {
             layer.confirm('是否确认重新结算？', {