异常处理

app/Http/Controllers/Admin/RegulationController.php

@@ -15,7 +15,7 @@ class RegulationController extends Controller
 {
 //    private $token='so5j3C150405826059a61b94de9df';
     /**
-     * @return 加款扣款1
+     * @return 加款扣款2
      */
     function index()
     {

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -32,6 +32,8 @@ class SoccerNoteListController extends Controller
         $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['match_id'] = isset($req->match_id) ? trim($req->match_id) : null;
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : null;//联赛id 用于冠军联赛投注
+        $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['game_status'] = isset($req->game_status) ? trim($req->game_status) : 0;
@@ -55,7 +57,7 @@ class SoccerNoteListController extends Controller
         $dt->addColsFields('game_status', array('sort' => false, 'width' => 80));
 
 
-    //     $arr[] = 'view';
+    //     $arr[] = 'view';1
     //    if (checkRriv('/admin/SoccerNoteList/edit')) {
     //        $arr[] = 'edit';
     //    }
@@ -64,7 +66,7 @@ class SoccerNoteListController extends Controller
         return view('sports/sports_notelist', $dt->render($request));
     }
 
-    //冠军注单手工结算
+    //冠军注单手工结算1
     public function championset(Req $req)
     {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
@@ -74,6 +76,8 @@ class SoccerNoteListController extends Controller
         $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['match_id'] = isset($req->match_id) ? trim($req->match_id) : null;
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : null;//联赛id 用于冠军联赛投注
+        $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['type'] = isset($req->type) ? trim($req->type) : 'zq';
@@ -113,6 +117,7 @@ class SoccerNoteListController extends Controller
         $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') : '';
+        $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') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
@@ -145,6 +150,9 @@ class SoccerNoteListController extends Controller
         if (!empty($match_id)) {
             $where[] = array('money_buy_simplex.match_id', $match_id);
         }
+        if(!empty($lg_id)){
+            $where[] = array('money_buy_simplex.lg_id', $lg_id);
+        }
         if ($status != -1) {
             $where[] = array('money_buy_simplex.settle_status', '=', $status);
         }
@@ -323,6 +331,8 @@ class SoccerNoteListController extends Controller
         $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['match_id'] = isset($req->match_id) ? trim($req->match_id) : null;
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : null;//联赛id 用于冠军联赛投注
+        $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['type'] = isset($req->type) ? trim($req->type) : 'zq';
@@ -361,6 +371,8 @@ class SoccerNoteListController extends Controller
         $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['match_id'] = isset($req->match_id) ? trim($req->match_id) : null;
+        $request['lg_id'] = isset($req->lg_id) ? trim($req->lg_id) : null;//联赛id 用于冠军联赛投注
+        $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['type'] = isset($req->type) ? trim($req->type) : 'zq';
@@ -398,6 +410,7 @@ class SoccerNoteListController extends Controller
         $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') : '';
+        $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') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
@@ -430,6 +443,9 @@ class SoccerNoteListController extends Controller
         if (!empty($match_id)) {
             $where[] = array('money_buy_simplex.match_id', $match_id);
         }
+        if(!empty($lg_id)){
+            $where[] = array('money_buy_simplex.lg_id', $lg_id);
+        }
 
         //调整状态查询 1,2,3为订单状态 1投注 2作废 3撤单
         if ($order_status == 1 || $order_status == 2 || $order_status == 3) {

app/Lib/Settlement/Adapter/LqRule.php

@@ -24,7 +24,7 @@ class LqRule
     public function concedeCommon($model, $difference)
     {
         // 让球个数
-        $condition = intval($model->condition);
+        $condition = trim($model->condition);
         // 差值
         $resultScore = $difference + $condition;
         if ($resultScore > 0) {
@@ -48,7 +48,7 @@ class LqRule
     public function sizeCommon($model, $allGoal, $size)
     {
         // 总球条件
-        $condition = intval($model->condition);
+        $condition = trim($model->condition);
         // 差值
         if ($size == 1) {
             $resultScore = $allGoal - $condition;

app/Models/SportsNoteList.php

@@ -35,12 +35,13 @@ class SportsNoteList extends BaseModel
      * 测试 使用
      */
     function getinfo($list = 10, $page, $where = '', $type){
+        // dd($where);
         $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')
+            ->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', 'money_buy_simplex.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')

app/Models/System_user.php

@@ -81,7 +81,9 @@ class System_user extends BaseModel {
 	 * @return [type]          [description]
 	 */
 	function adminLogin($account, $password, $checktwo = false) {
-		$account = strtolower($account);
+		//强制转换为小写 弃用
+		// $account = strtolower($account);
+
 		if (empty($account) || empty($password)) {
 			return -400844; //密码或用户名不能为空
 		}

resources/lang/zh-cn/sportsnotelist.php

@@ -3,6 +3,7 @@ return array(
 
     'id' => '序号',
     'match_id' => '赛事id',
+    'lg_id' => '联赛id',
     'order_id' => '订单号',
     'account_name' => '投注用户',
     'order_time' => '订单号/下注时间',

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

@@ -107,9 +107,22 @@
             }
             var url='/admin/Regulation/Edit?id=';
             url+=id;
-            str='<iframe id="ifadd" src='+url+' style="width: 100%;height: 100% ;border:0;"></iframe>';
+            // str='<iframe id="ifadd" src='+url+' style="width: 100%;height: 100% ;border:0;"></iframe>';
+            str='<iframe id="ifadd" src='+url+' style="width: 100%;height: 550px;border:0;"></iframe>';
             $('#content_iframe').html(str);
         }
+
+
+        //根据浏览器大小调整iframe高度
+        /*
+        reSetSize();
+        window.onresize = reSetSize;
+        function reSetSize() {
+            var windowsHeight = window.innerHeight;
+            document.getElementById("ifadd").style.height = (windowsHeight-80) + "px";
+        }
+        */
+
     </script>
 
     @include('vip.datatable')

resources/views/sports/sports_notelist.blade.php

@@ -97,12 +97,25 @@
                         </div>
                     </div>
 
-                    <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
-                        <div class="layui-input-inline" style="">
-                            <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                    @if($is_gj==1)
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('sportsnotelist.lg_id') }}</label>
+                            <div class="layui-input-inline" style="">
+                                <input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                    </div>
+                    @else
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
+                            <div class="layui-input-inline" style="">
+                                <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    @endif
+
+                   
+
+                    
 
                     <!--
                     <div class="layui-inline">

resources/views/sports/sports_search.blade.php

@@ -221,12 +221,30 @@
                         </div>
                     </div>
 
+                    @if($is_gj==1)
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('sportsnotelist.lg_id') }}</label>
+                            <div class="layui-input-inline" style="">
+                                <input type="text" name="lg_id" id="lg_id" eventType="event-query"  value="{{ $lg_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    @else
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
+                            <div class="layui-input-inline" style="">
+                                <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    @endif
+
+                    <!--
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
                         <div class="layui-input-inline" style="">
                             <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
                     </div>
+                    -->
 
                     @if(!isset($check))
                     <!--