瀏覽代碼

异常处理

彭俊 6 年之前
父節點
當前提交
9b151009eb

+ 3 - 3
app/Http/Controllers/Admin/GameController.php

@@ -23,16 +23,16 @@ class GameController extends Controller {
        $days = ($etimestamp - $stimestamp) / 86400;
        //保存每天日期
        $date = array();
-       for($i = 0;$i < $days;$i++){
+       for($i = 1;$i <= $days;$i++){
            $date[] = date('Y-m-d', $stimestamp + (86400 * $i));
        }
        //单式投注
-       $bet_money_s =DB::table('money_buy_simplex')->whereBetween('money_time',[$start_time,$end_time])
+       $bet_money_s =DB::table('money_buy_simplex')->whereBetween('money_time',[$start_time,$end_time.' 23:59:59'])
           ->selectRaw('date(money_time) as name,sum(money) as value')
           ->groupBy('money_time')->get();
 
         //串式投注
-        $bet_money_str =DB::table('money_buy_str')->whereBetween('money_time',[$start_time,$end_time])
+        $bet_money_str =DB::table('money_buy_str')->whereBetween('money_time',[$start_time,$end_time.' 23:59:59'])
         ->selectRaw('date(money_time) as name,sum(money) as value')
         ->groupBy('money_time')->get();
 

+ 17 - 8
app/Http/Controllers/Admin/IndexController.php

@@ -71,14 +71,18 @@ class IndexController extends Controller
         if (\App\Models\Role::hasRoot('/enable/show/bet_count') < 0) {
             $bet_count['count'] = "*****";
         } else {
+            //串式投注
             $numstr = \App\Models\MoneyBuyStr::where('money_buy_str.status', '<>', 4)->join('account', 'money_buy_str.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->count();
+            //单式投注
             $numsimplex = \App\Models\MoneyBuySimplex::where('money_buy_simplex.status', '<>', 4)->join('account', 'money_buy_simplex.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_buy_simplex.money_time', $timearea)->count();
             $bet_count['count'] = $numstr+$numsimplex;
         }
         if (\App\Models\Role::hasRoot('/enable/show/bet_money') < 0) {
             $bet_count['money_count'] = "*****";
         } else {
+            //串式投注
             $str_bet_money = \App\Models\MoneyBuyStr::where('money_buy_str.status', '<>', 4)->join('account', 'money_buy_str.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->sum('money');
+            //单式投注
             $simplex_bet_money = \App\Models\MoneyBuySimplex::where('money_buy_simplex.status', '<>', 4)->join('account', 'money_buy_simplex.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->sum('money');
             $bet_money = $str_bet_money+$simplex_bet_money;
             $bet_count['money_count'] = round($bet_money, 2);
@@ -89,7 +93,9 @@ class IndexController extends Controller
         } else {
             $db = new \App\Models\MoneyBuyStr;
             $db1 = new \App\Models\MoneyBuySimplex;
+            //串式投注
             $str = $db->countUser($timearea);
+            //单式投注
             $simplex = $db1->countUser($timearea);
             if($str && $simplex){
                 for($i=0;$i<count($str);$i++){
@@ -102,9 +108,6 @@ class IndexController extends Controller
                 }
             }
             $bet_count['user_count'] = count($str)+count($simplex);
-//            $usernumstr = \App\Models\MoneyBuyStr::select('account_name')->where('money_buy_str.status', '<>', 4)->join('account', 'money_buy_str.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->groupBy('account_name')->count();
-//            $usernumsimplex = \App\Models\MoneyBuySimplex::select('account_name')->where('money_buy_simplex.status', '<>', 4)->join('account', 'money_buy_simplex.account_identity', '=', 'account.identity')->where('account.status', '<>', '4')->where('account.user_type', '1')->whereBetween('money_time', $timearea)->groupBy('account_name')->count();
-//            $bet_count['user_count'] = $usernumstr+$usernumsimplex;
         }
         // $queries = DB::getQueryLog();
         // print_r($queries);
@@ -296,20 +299,26 @@ class IndexController extends Controller
     //今日投注统计饼状图
     function getBetUrl()
     {
-        $db = new \App\Models\OrderUrl;
-        $data = $db->getUrlBet();
-        $array['data'] = $data;
-        if (empty($data)) {
+//        $db = new \App\Models\OrderUrl;
+//        $data = $db->getUrlBet();
+        $count = $this->countBet();
+        //$array['data'] = $data;
+        if ($count['count'] == 0) {
             $array['data'][0]['name'] = '没有';
             $array['data'][0]['value'] = 0;
         }
+        else{
+            $array['data'][0]['name'] = '今日注单数量';
+            $array['data'][0]['value'] = $count['count'];
+        }
         //组装标
         foreach ($array['data'] as $k => $v) {
             $array['title'][$k] = $v['name'];
         }
         //添加标题
         //总投注数量
-        $count = $db->gettotal();
+        $count = $this->countBet();
+        $count = $count['count'];
         $array['text'] = date('Y-m-d') . trans('common.today_bet_num') . $count;
 //        dump($array);
         return responseToJson($array);

+ 5 - 5
app/Http/Controllers/Admin/UserController.php

@@ -23,7 +23,7 @@ class UserController extends Controller
         $request['agent_name'] = isset($req->agent_name) ? trim($req->agent_name) : null;
         $request['select_type'] = isset($req->select_type) ? trim($req->select_type) : null;
         $request['select_value'] = isset($req->select_value) ? trim($req->select_value) : null;
-        $request['grade'] = isset($req->grade) ? trim($req->grade) : null;
+        $request['grade'] = isset($req->grade) ? trim($req->grade) : '-1';
         $request['statuss'] = isset($req->statuss) ? trim($req->statuss) : null;
         $request['rechargenum_small'] = isset($req->rechargenum_small) ? trim($req->rechargenum_small) : null;
         $request['rechargenum_big'] = isset($req->rechargenum_big) ? trim($req->rechargenum_big) : null;
@@ -49,11 +49,11 @@ class UserController extends Controller
         $dt->setLang('user');
         // $dt->addColsFields('id', array('sort' => false));
         $dt->addColsFields('account_grade', array('templet' => '#userdetail', 'width'=>120,'sort' => false));
-        $dt->addColsFields('cash', array('templet' => '#moneyrecord','width'=>90));
-        $dt->addColsFields('name', array('templet' => '#selectname', 'width'=>90,'sort' => false));
+        $dt->addColsFields('cash', array('width'=>100));//'templet' => '#moneyrecord',
+        $dt->addColsFields('name', array( 'width'=>90,'sort' => false));//'templet' => '#selectname',
         $dt->addColsFields('register_last_time',array('width'=>160,'templet'=>'#register_last', 'sort' => false)); //'templet' => '#selectname',
-        $dt->addColsFields('register_log_ip', array('templet' => '#selectip','width'=>130, 'sort' => false));
-        $dt->addColsFields('register_log_url', array('width'=>150,'sort' => false, 'templet' => '#selecturl','display'=>'inline-block','overflow'=>'hidden'));
+        $dt->addColsFields('register_ip', array('width'=>120, 'sort' => false));//'templet' => '#selectip',
+        $dt->addColsFields('register_url', array('width'=>160,'sort' => false, 'display'=>'inline-block','overflow'=>'hidden'));//'templet' => '#selecturl',
         $dt->addColsFields('phone', array( 'sort' => false, 'width'=>120));
         // $dt->addColsFields('qq', array('width'=>120, 'sort' => false));
         // $dt->addColsFields('wechat', array('width'=>120, 'sort' => false));

+ 0 - 1
app/Models/Account.php

@@ -48,7 +48,6 @@ class Account extends BaseModel
         $data = json_encode ($data);
         $data = json_decode ($data, 1);
         $res = array('data' => $data, 'total' => $total[0]->count);
-
         return $res;
     }
     /*

+ 3 - 0
resources/views/admin/Regulation/index.blade.php

@@ -20,6 +20,9 @@
         .layui-form-item .checkbox {
             width: auto;
         }
+        .layui-table-page{
+            display: none;
+        }
     </style>
 
     <script type="text/html" id="userRegulation">

+ 3 - 3
resources/views/admin/user/index.blade.php

@@ -310,11 +310,11 @@
 					<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>
-                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;" eventType=event-query-submit><i class="layui-icon">ဂ</i></a>-->
+                        <a class="layui-btn   layui-btn-sm  layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;" >重置</a>
+						<!--<a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;" eventType=event-query-submit><i class="layui-icon">ဂ</i></a>-->
                     </div>
 					<div class="layui-inline">
-						<a href="/admin/user/index?regist_startime={{ trans('money.today_start') }}&regist_endtime={{ trans('money.today_end') }}" class="layui-btn layui-btn-sm registtoday" data-id="{{ trans('money.today_start') }}" data-name="{{ trans('money.today_end') }}"   data-type="reload" style="opacity: 1; pointer-events: auto;">今日注册</a>
+						<!--<a href="/admin/user/index?regist_startime={{ trans('money.today_start') }}&regist_endtime={{ trans('money.today_end') }}" class="layui-btn layui-btn-sm registtoday" data-id="{{ trans('money.today_start') }}" data-name="{{ trans('money.today_end') }}"   data-type="reload" style="opacity: 1; pointer-events: auto;">今日注册</a>-->
 						<a href="/admin/user/index?last_startime={{ trans('money.today_start') }}&last_endtime={{ trans('money.today_end') }}" class="layui-btn layui-btn-sm onlinetoday" data-id="{{ trans('money.today_start') }}" data-name="{{ trans('money.today_end') }}"   data-type="reload" style="opacity: 1; pointer-events: auto;">今日在线</a>
 						<a href="/admin/user/index?statuss=1" class="layui-btn layui-btn-sm online"  data-type="reload" style="opacity: 1; pointer-events: auto;">当前在线</a>
 						<a href="/admin/user/index?status=5" class="layui-btn layui-btn-sm onlines"  data-type="reload" style="opacity: 1; pointer-events: auto;">禁用会员列表</a>

+ 2 - 3
resources/views/admin/welcome.blade.php

@@ -202,7 +202,7 @@
         <li class="layui-this">最近7天注册用户记录</li>
         <li>最近7天财务情况</li>
         <li>今日来源分析</li>
-        <li>今日注单分析</li>
+        <li style="display: none;">今日注单分析</li>
         <li>最近7天投注总额趋势图</li>
     </ul>
     <div class="layui-tab-content">
@@ -223,8 +223,7 @@
                 </div>
             </div>
         </div>
-
-        <div class="layui-tab-item">
+        <div class="layui-tab-item" style="display: none;">
             <div class="layui-row layui-col-space10">
                 <div class="layui-col-md5">
                     <div id="main-bing3" style="width: 480px;height:700px;"></div>