From dc6790b4041dd67b876fd650b9633a4e7052b433 Mon Sep 17 00:00:00 2001 From: "elf@home" <360197197@qq.com> Date: Sun, 24 Nov 2019 10:42:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/RechargeSumController.class.php | 2 +- Application/Admin/Controller/SpendController.class.php | 1 - Application/Admin/View/Member/user_info.html | 4 ++-- Application/Home/Controller/DownloadController.class.php | 8 +++++--- Application/Home/Controller/QueryController.class.php | 4 +++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/RechargeSumController.class.php b/Application/Admin/Controller/RechargeSumController.class.php index c877ce33e..3c6b68fa8 100644 --- a/Application/Admin/Controller/RechargeSumController.class.php +++ b/Application/Admin/Controller/RechargeSumController.class.php @@ -48,7 +48,7 @@ class RechargeSumController extends ThinkController } //当天注册人数 - $registerNum = D('User')->where(array_merge($rmap, array('puid' => 0)))->join("tab_user_play on tab_user.id = tab_user_play.user_id and tab_user.fgame_id = tab_user_play.game_id")->field("tab_user.id")->select(); + $registerNum = D('User')->where(array_merge($rmap, array('puid' => 0)))->join("tab_user_play on tab_user.id = tab_user_play.user_id and tab_user.fgame_id = tab_user_play.game_id", 'left')->field("tab_user.id")->select(); $registerNum = $registerNum ? array_column($registerNum, 'id') : []; //当天活跃人数 diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index ade87c965..945cc790f 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -100,7 +100,6 @@ class SpendController extends ThinkController $map = '1 = 2'; $map1 = $map; } - echo (D(self::model_name)->where($map1)->fetchSql(true)->sum('pay_amount')); $total = null_to_0(D(self::model_name)->where($map1)->sum('pay_amount')); $ttotal = null_to_0(D(self::model_name)->where('pay_time' . total(1))->where(array('pay_status' => 1))->sum('pay_amount')); $ytotal = null_to_0(D(self::model_name)->where('pay_time' . total(5))->where(array('pay_status' => 1))->sum('pay_amount')); diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 3111dcb7f..313c68e1e 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -224,8 +224,8 @@ 注册方式 注册时间 + 注册IP 最后登录时间 - 最后登录IP 设备号 账号状态 拉黑状态 @@ -276,6 +276,7 @@ {$data.register_time|date='Y-m-d H:i:s',###} + {$data.register_ip} 空 @@ -283,7 +284,6 @@ {$data['login_time']|date='Y-m-d H:i:s',###} - {$data.register_ip} {$data.device_number} diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index d9c05a31b..a88cc4292 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1814,7 +1814,7 @@ class DownloadController extends BaseController { array('create_time','创建时间'), ); $model = M('user_play_info','tab_'); - $data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level')->where($map)->order('create_time desc')->select(); + $data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level,create_time')->where($map)->order('create_time desc')->select(); $xlsData = []; foreach ($data as $key1 => $value1) { $value1['user_account'] = $this->encryption($value1['user_account']); @@ -1875,7 +1875,7 @@ class DownloadController extends BaseController { ->join($serverJoin)//关联区服表 ->where($map) ->group('tab_apply.game_id') - ->order('g.sort desc,tab_apply.id desc') + ->order('g.sort desc,g.id desc') ->select(); $records = []; if (!empty($data)) { @@ -2813,7 +2813,9 @@ class DownloadController extends BaseController { $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]]; $roleIdMap = $subMap; $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true); - $map['role_id'] = ['in', $roleIds]; + if (count($roleIds) > 0) { + $map['role_id'] = ['in', $roleIds]; + } if ($costBegin != '' || $costEnd != '') { $having = ''; if ($costBegin != '' && $costEnd != '') { diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index c4d6fa044..8b2338baa 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1772,7 +1772,9 @@ class QueryController extends BaseController $subMap['create_time'] = ['between', [$begTime, $endTime - 1]]; $roleIdMap = $subMap; $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true); - $map['role_id'] = ['in', $roleIds]; + if (count($roleIds) > 0) { + $map['role_id'] = ['in', $roleIds]; + } if ($costBegin != '' || $costEnd != '') { $having = ''; if ($costBegin != '' && $costEnd != '') {