异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -36,6 +36,7 @@ class SoccerNoteListController extends Controller
         $request['is_gj'] = isset($req->is_gj) ? trim($req->is_gj) : 0;//是否是冠军联赛投注 0否 1是
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
+        $request['p_codes'] = isset($req->p_codes) ? trim($req->p_codes) : null;
         $request['game_status'] = isset($req->game_status) ? trim($req->game_status) : 0;
         $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
@@ -80,6 +81,7 @@ class SoccerNoteListController extends Controller
         $request['is_gj'] = isset($req->is_gj) ? trim($req->is_gj) : 1;//是否是冠军联赛投注 0否 1是
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
+        $request['p_codes'] = isset($req->p_codes) ? trim($req->p_codes) : null;
         $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerNoteList/championsetinfo');
@@ -120,6 +122,7 @@ class SoccerNoteListController extends Controller
         $lg_id = Request::get('lg_id') ? Request::get('lg_id') : '';
         $status = Request::has('status') ? Request::get('status') : '-1';
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
+        $p_codes = Request::has('p_codes') ? Request::get('p_codes') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $type = Request::has('type') ? Request::get('type') : 'zq';
         $where = array();
@@ -151,6 +154,10 @@ class SoccerNoteListController extends Controller
             $where[] = array('money_buy_simplex.match_id', $match_id);
         }
 
+        if (!empty($p_codes)) {
+            $where[] = array('money_buy_match.p_code', $p_codes);
+        }
+
         //调整状态查询 1,2,3为订单状态 1投注 2作废 3撤单
         if ($order_status == 1 || $order_status == 2 || $order_status == 3) {
             $where[] = array('money_buy_simplex.status', '=', $order_status);
@@ -315,6 +322,7 @@ class SoccerNoteListController extends Controller
         $match_id = Request::get('match_id') ? Request::get('match_id') : '';
         // $status = Request::has('status') ? Request::get('status') : '';
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
+        $p_codes = Request::has('p_codes') ? Request::get('p_codes') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $type = Request::has('type') ? Request::get('type') : 'zq';
 
@@ -347,6 +355,10 @@ class SoccerNoteListController extends Controller
             $where[] = array('money_buy_simplex.match_id', $match_id);
         }
 
+        if (!empty($p_codes)) {
+            $where[] = array('money_buy_match.p_code', $p_codes);
+        }
+
         //调整状态查询 1,2,3为订单状态 1投注 2作废 3撤单
         if ($order_status == 1 || $order_status == 2 || $order_status == 3) {
             $where[] = array('money_buy_simplex.status', '=', $order_status);
@@ -429,6 +441,7 @@ class SoccerNoteListController extends Controller
         $request['is_gj'] = isset($req->is_gj) ? trim($req->is_gj) : 0;//是否是冠军联赛投注 0否 1是
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
+        $request['p_codes'] = isset($req->p_codes) ? trim($req->p_codes) : null;
         $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerNoteList/info');
@@ -469,6 +482,7 @@ class SoccerNoteListController extends Controller
         $request['is_gj'] = isset($req->is_gj) ? trim($req->is_gj) : 1;//是否是冠军联赛投注 0否 1是
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
+        $request['p_codes'] = isset($req->p_codes) ? trim($req->p_codes) : null;
         $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerNoteList/championinfo');
@@ -507,6 +521,7 @@ class SoccerNoteListController extends Controller
         $lg_id = Request::get('lg_id') ? Request::get('lg_id') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
+        $p_codes = Request::has('p_codes') ? Request::get('p_codes') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $type = Request::has('type') ? Request::get('type') : 'zq';
         $where = array();
@@ -541,6 +556,10 @@ class SoccerNoteListController extends Controller
             $where[] = array('money_buy_simplex.lg_id', $lg_id);
         }
 
+        if (!empty($p_codes)) {
+            $where[] = array('money_buy_match.p_code', $p_codes);
+        }
+
         //调整状态查询 1,2,3为订单状态 1投注 2作废 3撤单
         if ($order_status == 1 || $order_status == 2 || $order_status == 3) {
             $where[] = array('money_buy_simplex.status', '=', $order_status);
@@ -733,6 +752,7 @@ class SoccerNoteListController extends Controller
         $match_id = Request::get('match_id') ? Request::get('match_id') : '';
         $status = Request::has('status') ? Request::get('status') : '-1';
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
+        $p_codes = Request::has('p_codes') ? Request::get('p_codes') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $type = Request::has('type') ? Request::get('type') : 'zq';
         $where = array();
@@ -764,6 +784,10 @@ class SoccerNoteListController extends Controller
             $where[] = array('money_buy_simplex.match_id', $match_id);
         }
 
+        if (!empty($p_codes)) {
+            $where[] = array('money_buy_match.p_code', $p_codes);
+        }
+
         //调整状态查询 1,2,3为订单状态 1投注 2作废 3撤单
         if ($order_status == 1 || $order_status == 2 || $order_status == 3) {
             $where[] = array('money_buy_simplex.status', '=', $order_status);
@@ -833,6 +857,44 @@ class SoccerNoteListController extends Controller
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
 
+    /**
+     * 取消结算
+     */
+    public function no_cancel_end(Req $req){
+        $order_id = $req->order_id;
+
+        if(empty($order_id)){
+            return responseToJson(-1, '参数错误');
+        }
+        try {
+            //开启事务
+            DB::beginTransaction();
+            //处理注单数据
+            $orderModel = new \App\Models\SportsNoteList();
+
+            $ret = $orderModel->no_cancel_end($order_id);
+            if($ret != 1)  throw new \Exception('操作失败');
+            //提交事务
+            DB::commit();
+            return responseToJson(1, '成功');
+        } catch (\Exception $e) {
+            //回滚事务
+            DB::rollBack();
+            return responseToJson(-1, $e->getMessage());
+        }
+    }
+
+    /**
+     * 取消作废
+     */
+    public function no_cancel_invalid(Req $req){
+        $order_id = $req->order_id;
+        return responseToJson(1, '成功', $order_id);
+
+        dd('取消作废');
+
+    }
+
     /**
      *单式注单作废
      */
@@ -1190,6 +1252,9 @@ class SoccerNoteListController extends Controller
         if (empty($order_id) || empty($game_code) || empty($match_id) || empty($pdatas)) {
             return responseToJson(0, '参数错误');
         }
+        if(in_array(-1,$pdatas)){
+            return responseToJson(-1, '输入比分错误');
+        }
 
         $buyModel = (new MoneyBuySimplexModel())->where([['order_id', '=', $order_id]])->first();
         if (empty($buyModel)) {
@@ -1436,5 +1501,11 @@ class SoccerNoteListController extends Controller
         return $data;
     }
 
+    public function getpcode(){
+        $game_type = $_GET["game_type"];
+        $p_code =  \App\Models\StoddsCode::where('p_id',0)->where('game_code',$game_type)->get();
+        return json_encode($p_code);
+    }
+
 
 }

app/Lib/Settlement/SettlementAuto.php

@@ -72,6 +72,8 @@ class SettlementAuto
             if ($mbmm['bet2'] > 0) {
                 $this->SubmitSettelement('s', array_merge($dataComm, ['bettype' => 2]));
             }
+            $this->cgStatus($model->game_code, $model->match_id);
+            
             return true;
         }
         return false;
@@ -79,28 +81,29 @@ class SettlementAuto
 
 
     //提交结算
+
     /****
      *参数说明
-
-     结算接口
-    Settelement - Array
-    (
-    [match_id] => 1934   赛事id
-    [game_code] => zq    赛事代码
-    [change_status] => 1   是否更改赛事结果及赛事状态
-    [bettype] => 1        1单式  2串式
-    [settype] => 2         统一为2
-    [is_manaue] => 0      是否手动（全赛事是为0）,手动单个手动更改结果订单处理时为1
-    [order_ids] =>       订单号，单一订单写单订单号， 也可能同一赛事的多个订单是以用半角逗号分开，为空则为单式全部订单或串式全部订单
-    [token] => oclatv15689731035d84a12f550df            //管理叫id ,后台可用    session('adminInfo.token') 直接获取
-    )
-
-     输赢接口
-    WinFail - Array
-    (
-    [noticeid] => 1514   comendnotice表的ID
-    [token] => oclatv15689731035d84a12f550df
-    )
+     *
+     * 结算接口
+     * Settelement - Array
+     * (
+     * [match_id] => 1934   赛事id
+     * [game_code] => zq    赛事代码
+     * [change_status] => 1   是否更改赛事结果及赛事状态
+     * [bettype] => 1        1单式  2串式
+     * [settype] => 2         统一为2
+     * [is_manaue] => 0      是否手动（全赛事是为0）,手动单个手动更改结果订单处理时为1
+     * [order_ids] =>       订单号，单一订单写单订单号， 也可能同一赛事的多个订单是以用半角逗号分开，为空则为单式全部订单或串式全部订单
+     * [token] => oclatv15689731035d84a12f550df            //管理叫id ,后台可用    session('adminInfo.token') 直接获取
+     * )
+     *
+     * 输赢接口
+     * WinFail - Array
+     * (
+     * [noticeid] => 1514   comendnotice表的ID
+     * [token] => oclatv15689731035d84a12f550df
+     * )
      */
     public function SubmitSettelement($type, $datas)
     {

app/Models/SportsNoteList.php

@@ -232,7 +232,6 @@ class SportsNoteList extends BaseModel
                 <br>
                 <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
             } 
-            */
 
             //操作栏 按钮
             if($v->status==1){
@@ -248,6 +247,29 @@ class SportsNoteList extends BaseModel
                 // <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
       
             }
+            */
+
+            //操作 按钮
+            //投注/未结算 则有结算/作废 按钮
+            if($v->status==1 and $v->settle_status ==1){
+                $v->game_status = '
+                <button style="margin-left: 0;" onclick="'.$function.'(\'' . $v->order_id . '\',\''.$v->match_id.'\',\''.$type.'\')"  class="layui-btn layui-btn-sm settlement">手动结算</button>
+                <br>
+                <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
+            }
+            //投注/已结算 则有取消结算/作废 按钮
+            if($v->status==1 and $v->settle_status >1){
+                $v->game_status = '
+                <button style="margin-left: 0;" onclick="no_cancel_end(\'' . $v->order_id . '\')"  class="layui-btn layui-btn-sm settlement">取消结算</button>
+                <br>
+                <a class="layui-btn layui-btn-sm invalid" style="background-color:red" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $v->id . '\',\''.$v->order_id.'\',\''.$v->league.'\');"> 作废 </a>';
+            }
+            //作废  取消作废
+            if($v->status==2){
+                $v->game_status = '
+                <button style="margin-left: 0;" onclick="no_cancel_invalid(\'' . $v->order_id . '\')"  class="layui-btn layui-btn-sm settlement">取消作废</button>';
+            }
+
         }
         return $orderData->toArray();
     }
@@ -1520,8 +1542,11 @@ class SportsNoteList extends BaseModel
                 if($str == 1){
                     try {
                         DB::beginTransaction();//开启事务
-                        $this->where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0','gain_money' => '0']);//'use_mark'=>'通过设置赛事比分作废'
-                        \App\Models\MoneyBuyStr::where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0','gain_money' => '0']);
+                        if($v['str_type']){//串式注单
+                            \App\Models\MoneyBuyStr::where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0','gain_money' => '0']);
+                        }else{//单式注单
+                            $this->where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0','gain_money' => '0']);//'use_mark'=>'通过设置赛事比分作废'
+                        }
                         \App\Models\SettlementMiddleDetail::where('order_id', $v['order_id'])->update(['money' => '0']);
                         \App\Models\MoneyBuyMatch::where('order_id', $v['order_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
                         \App\Models\Account_detailed::where('account_identity', $v['account_identity'])->update(['available_cash' => $v['available_cash'], 'cash' => $v['available_cash']]);
@@ -1532,9 +1557,18 @@ class SportsNoteList extends BaseModel
                         DB::rollback();//回滚
                     }
                 }else{
-                    $this->where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0']);
-                    \App\Models\MoneyBuyStr::where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0']);
-                    \App\Models\MoneyBuyMatch::where('order_id', $v['order_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
+                    try {
+                        DB::beginTransaction();//开启事务
+                        if($v['str_type']){//串式注单
+                            \App\Models\MoneyBuyStr::where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0']);
+                        }else{//单式注单
+                            $this->where('order_id', $v['order_id'])->update(['status' => '1','settle_status' => '1','game_status' => '0']);
+                        }
+                        \App\Models\MoneyBuyMatch::where('order_id', $v['order_id'])->where('match_id', $matchid)->update(['result' => 0, 'status' => 0]);
+                        DB::commit();//提交
+                    } catch (Exception $e) {
+                        DB::rollback();//回滚
+                    }
                 }
             }
         }
@@ -2076,4 +2110,82 @@ class SportsNoteList extends BaseModel
         $sim = $this->select('id','match_id')->where('game_code',$game_code)->get();
         return $sim;
     }
+
+    //取消结算
+    public function no_cancel_end($order_id){
+        //获取注单数据
+        $orderData = $this->where('order_id',$order_id)->first();
+        if(empty($orderData)) throw new \Exception('未找到该注单');
+        //投注用户
+        $account_name = $orderData->account_name;
+        //用户uuid = 
+        $account_identity = $orderData->account_identity;
+        //获取注单中奖金额
+        $gain_money = $orderData->gain_money;
+        //获取注单状态
+        $status = $orderData->status;
+        //获取结算状态
+        $settle_status = $orderData->settle_status;
+
+        //如果注单状态不是投注-已结算
+        if($status != 1 and $settle_status < 2) throw new \Exception('注单状态错误');
+
+        //获取用户账户余额
+        $account_money = \App\Models\Account_detailed::where('account_identity',$account_identity)->SELECT('account_identity','available_cash')->first()->available_cash;
+    
+        //===处理用户资金相关===
+         //需扣除金额 = 中奖金额
+         $money = $gain_money;
+         //用户剩余金额
+         $new_available_cash = $account_money - $money;
+         $models = new \App\Models\Money_details();
+         $models->info_identity = UUID();
+         $models->trade_id = $order_id;//交易id
+         $models->account_name = $account_name;//用户名
+         $models->account_identity = $account_identity;//用户uuid
+         $models->money = $money;//变动金额
+         $models->money_time = date("Y-m-d H:i:s", time());//资金发生时间
+         $models->money_type = '2';//1.增加 2.减少
+         
+         $models->money_cash = $new_available_cash;//剩余金额
+         $models->trade_type = '26';//交易类型 26 已结算改为未结算 扣除中奖金额
+         $models->trade_desc = '已结算改为未结算，扣除中奖金额：￥'.$money.';订单号:'.$order_id.'';//交易描述
+         $models->status = '1';//1成功 2失败
+
+         //新增资金流水
+         if(!$models->save()) throw new \Exception('新增资金流水失败');
+
+         //更新用户资金
+         $ret_user = \App\Models\Account_detailed::where('account_identity',$account_identity)->update(['available_cash' => $new_available_cash, 'cash' => $new_available_cash]);
+         if($ret_user < 1)  throw new \Exception('更新用户资金失败');
+     
+         //更新订单数据
+         $order_up = [
+             'gain_money' =>0,//中奖金额 0
+             'settle_status' =>1,//结算状态 未结算
+             'game_status' =>0,//开奖状态 未开奖
+             'remark' =>'已结算注单改为未结算',//处理备注
+         ];
+         $ret_order = self::where('order_id',$order_id)->update($order_up);//将注单已结算改为未结算
+         if($ret_order < 1)  throw new \Exception('注单数据更新失败');
+
+         //更新投注详情数据
+         $match_up = [
+             'status'=>0,//结算状态 0 未结算
+             'result'=>0,//结果状态 0 未处理
+             'utime'=>date("Y-m-d H:i:s", time()),//更新时间
+             'matchresult'=>'',//结算结果 默认空
+
+         ];
+         $ret_money_buy_match = \App\Models\MoneyBuyMatch::where('order_id',$order_id)->update($match_up);
+         if($ret_money_buy_match < 1)  throw new \Exception('注单详情投注数据更新失败');
+         //===end===
+
+         return 1;
+    }
+
+    //取消作废
+    public function no_cancel_invalid($order_id){
+        dd($order_id);
+    }
 }

resources/lang/zh-cn/sportsnotelist.php

@@ -50,6 +50,7 @@ return array(
     'odds_code' => '赔率代码',
     'condition' => '赔率条件',
     'odds' => '赔率值',
+    'p_code' => '玩法',
 
 
 

resources/views/sports/sports_notelist.blade.php

@@ -53,7 +53,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.notelist_type') }}</label>
                         <div class="layui-input-inline" style="">
-                            <select name="type"  id="form_type"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                            <select name="type"  id="form_type"  lay-verify="" lay-filter = 'sect' autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>
                                 @foreach(trans('status.notelist_type.type') as $k=>$v):
                                 @if($type==$k))
@@ -151,6 +151,15 @@
                         </div>
                     </div>
 
+                    <input type="hidden" name="p_codes" id="p_codes" eventType="event-query"  value="{{$p_codes}}" lay-verify="required" autocomplete="off" class="layui-input">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.p_code') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <select name="p_code"  id="form_p_code"   lay-verify="" lay-filter = 'select' autocomplete="off" class="layui-input">
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
@@ -172,6 +181,52 @@
     </div>
 
     <script>
+        //获取玩法并组装成html代码
+        function getpcode(lgid){
+            $.ajax({
+                type:'get',
+                url:'/admin/SoccerNoteList/getpcode',
+                data:{game_type:lgid},
+                dataType:'json',
+                success:function(data){  //请求成功回调函数1
+                    //console.log(data);
+                    var option = '';
+                    option += '<option value></option>';
+                    for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
+                        if($('#p_codes').val() == data[i]["odds_code"]){
+                            option += "<option value="+data[i]["odds_code"]+" selected=\"selected\">"+data[i]["odds_name"]+"</option>";
+                        }else{
+                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_name"]+"</option>";
+                        }
+                    }
+                    $("#form_p_code").html(option);
+                    //重新渲染select
+                    form.render('select');
+                },
+            });
+        }
+        $game_type = $('#form_type').val();
+        getpcode($game_type);
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
+                getpcode(lgid);
+            })
+
+            form.on('select(select)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
+                $('#p_codes').val(lgid);
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+
+
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
                 var span = $(this).prev();
@@ -316,7 +371,7 @@
     $('.reset').on('click',function(){
     $('input').val('');
     $('#form_status').val('3');
-    $('.layui-form-select input').val('待审核');
+    $('.layui-form-select input').val();
     //var type = $(this).data('type');
     //active[type] ? active[type].call(this) : '';
     });
@@ -794,7 +849,11 @@ console.log(matchdata);
                         layer.alert("设置成功", {title: '友情提示', icon: 1, closeBtn: 0}, function () {
                             window.location.reload();
                         });
-                    } else {
+                    } 
+                    else if(-1 == res.status) {
+                        layer.alert(res.msg, {title: '友情提示', icon: 2});
+                    }
+                    else {
                         layer.alert("服务器异常(0)", {title: '友情提示', icon: 2});
                     }
                 },
@@ -1003,6 +1062,47 @@ console.log(matchdata);
 //            });
 
         }
+        /**
+        取消结算
+         */
+        function no_cancel_end(order_id){
+            layer.confirm('取消结算？', {
+               btn: ['确认', '取消'] //按钮
+           }, function() {
+               $.getJSON("/admin/SoccerNoteList/no_cancel_end", {'order_id' : order_id}, function(data, textStatus) {
+                   if (data.statusa == 1) {
+                       reloadDataTable();
+                       layer.msg('成功');
+                   } else {
+                       layer.msg(data.msg);
+                   }
+               });
+           }, function() {
+
+           });
+
+            // console.log(order_id+'取消结算')
+        }
+        /**
+        取消作废
+         */
+         function no_cancel_invalid(order_id){
+            layer.confirm('取消作废？', {
+               btn: ['确认', '取消'] //按钮
+           }, function() {
+               $.getJSON("/admin/SoccerNoteList/no_cancel_invalid", {'order_id' : order_id}, function(data, textStatus) {
+                   if (data.statusa == 1) {
+                       reloadDataTable();
+                       layer.msg('成功');
+                   } else {
+                       layer.msg(data.msg);
+                   }
+               });
+           }, function() {
+
+           });
+            // console.log(order_id+'取消作废');
+         }
     </script>
 
     @include('vip.datatable')

resources/views/sports/sports_search.blade.php

@@ -177,7 +177,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.notelist_type') }}</label>
                         <div class="layui-input-inline" style="">
-                            <select name="type"  id="form_type"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                            <select name="type"  id="form_type"  lay-verify="" lay-filter = 'sect' autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>
                                 @foreach(trans('status.notelist_type.type') as $k=>$v):
                                 @if($type==$k))
@@ -268,7 +268,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.order_status') }}</label>
                         <div class="layui-input-inline" style="">
-                            <select name="order_status"  id="form_order_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                            <select name="order_status"  id="form_order_status"   lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>
                                 @foreach(trans('status.order_status.status') as $k=>$v):
                                 @if($order_status==$k))
@@ -280,6 +280,16 @@
                             </select>
                         </div>
                     </div>
+
+                    <input type="hidden" name="p_codes" id="p_codes" eventType="event-query"  value="{{$p_codes}}" lay-verify="required" autocomplete="off" class="layui-input">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.p_code') }}</label>
+                        <div class="layui-input-inline" style="">
+                            <select name="p_code"  id="form_p_code"   lay-verify="" lay-filter = 'select' autocomplete="off" class="layui-input">
+                            </select>
+                        </div>
+                    </div>
+
                     @endif
 
                     <div class="layui-inline">
@@ -318,6 +328,51 @@
             })
         })
 
+        //获取玩法并组装成html代码
+        function getpcode(lgid){
+            $.ajax({
+                type:'get',
+                url:'/admin/SoccerNoteList/getpcode',
+                data:{game_type:lgid},
+                dataType:'json',
+                success:function(data){  //请求成功回调函数1
+                    //console.log(data);
+                    var option = '';
+                    option += '<option value></option>';
+                    for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
+                        if($('#p_codes').val() == data[i]["odds_code"]){
+                            option += "<option value="+data[i]["odds_code"]+" selected=\"selected\">"+data[i]["odds_name"]+"</option>";
+                        }else{
+                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_name"]+"</option>";
+                        }
+                    }
+                    $("#form_p_code").html(option);
+                    //重新渲染select
+                    form.render('select');
+                },
+            });
+        }
+        $game_type = $('#form_type').val();
+        getpcode($game_type);
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
+                getpcode(lgid);
+            })
+
+            form.on('select(select)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
+                $('#p_codes').val(lgid);
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+
     </script>
     @push('dataTableJS')
         /*var active = {
@@ -353,7 +408,7 @@
     $('.reset').on('click',function(){
     $('input').val('');
     $('#form_status').val('3');
-    $('.layui-form-select input').val('待审核');
+    $('.layui-form-select input').val();
     //var type = $(this).data('type');
     //active[type] ? active[type].call(this) : '';
     });