From 4d070462ac2a8b97bd18abcf23edf13f9e12adba Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 12:33:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 63e44c57b..6f07d8ae2 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1782,16 +1782,13 @@ class QueryController extends BaseController $ids[] = $queryPromote['id']; $map = ['uc.promote_id' => ['in', $ids]]; - $subMap = ['promote_id' => ['in', $ids]]; if ($relationGameId != 0 || $sdkVersion != 0) { $gameIds = gameSearch($relationGameId, $sdkVersion); $map['uc.game_id'] = ['in', $gameIds]; - $subMap['game_id'] = ['in', $gameIds]; } if ($serverId != 0) { $map['uc.server_id'] = $serverId; - $subMap['server_id'] = $serverId; } if ($roleName != '') { $map['ui.role_name'] = ['like', $roleName . '%']; @@ -1857,9 +1854,9 @@ class QueryController extends BaseController $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id') + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->where($map) - ->group('uc.role_id,uc.game_id,uc.user_id') + ->group('uc.role_id,uc.server_id,uc.game_id') ->buildSql(); $query = M()->alias('record') ->table($subQuery) @@ -1867,15 +1864,10 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); - $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') + $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') - ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id') + ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->where($map) - ->buildSql(); - $total = M()->alias('totals') - ->table($totalQuery) - ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); foreach ($records as &$list) { From fc2596a7cc47819b0b23d773993047fef277ab3c Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Dec 2019 14:58:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E6=97=B6=E9=97=B4=E5=8C=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 012598ebe..0a524b649 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3178,7 +3178,7 @@ class DownloadController extends BaseController { unset($map['costbegin']); unset($map['costend']); $nowTime = strtotime(date('Y-m-d 00:00:00', time())); - $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]]; + $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime']-1]]; if ($costBegin != '' || $costEnd != '') { $having = ''; if ($costBegin != '' && $costEnd != '') { @@ -3196,7 +3196,7 @@ class DownloadController extends BaseController { $map['_string'] = 'ui.role_id in (' . $subQuery . ')'; } $secondDay = 24*3600 + 1; - $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]]; + $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime']-1]]; unset($map['begintime']); unset($map['endtime']); //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id'; From a19a7b530eadbb7bc033d1da0e1bb6d537300aaa Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 16:20:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=A6=82=E5=86=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 6f07d8ae2..66b79687d 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1114,6 +1114,7 @@ class QueryController extends BaseController $summaryData = []; $dayList = $this->getDayList($begTime, $endTime); + $dayList = array_reverse($dayList); $params['dayList'] = $dayList; $records = []; From 60fff33fca2130261b72868238ab33268c13de66 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 17:22:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 66b79687d..7b1c4b9ba 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1114,6 +1114,7 @@ class QueryController extends BaseController $summaryData = []; $dayList = $this->getDayList($begTime, $endTime); + $dayListReverse = $dayList; $dayList = array_reverse($dayList); $params['dayList'] = $dayList; @@ -1185,7 +1186,9 @@ class QueryController extends BaseController $allData['spend_binding'] = bcadd($allData['spend_binding'], $spendBindingList[$day], 2); $allData['spend_discount'] = bcadd($allData['spend_discount'], 0, 2); $allData['spend_voucher'] = bcadd($allData['spend_voucher'], 0, 2); - + } + foreach ($dayListReverse as $day) { + $date = date('Ymd', strtotime($day)); $summaryData['date'][] = $date; $summaryData['role_num'][] = $roleNumList[$day]; $summaryData['user_num'][] = $userNumList[$day]; @@ -1865,10 +1868,15 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); - $total = M('user_play_data_count', 'tab_')->alias('uc') + $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') + ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id') ->where($map) + ->buildSql(); + $total = M()->alias('totals') + ->table($totalQuery) + ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); foreach ($records as &$list) { From 2cb7d9bdfdb06e67752bf4a2841513d7745e262b Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 17 Dec 2019 17:33:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=89=B6=E6=8C=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Support/lists.html | 12 ++++++------ .../Admin/View/TestResource/supportNumberList.html | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index 8c82c84d7..f5619647f 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -32,7 +32,7 @@
-

扶持发放

+

资源发放

说明：记录所有扶持发放的数据

@@ -77,8 +77,8 @@
@@ -111,7 +111,7 @@ 区服 角色名 申请额度 - 扶持类型 + 资源类型 备注 申请时间 可用额度 @@ -134,7 +134,7 @@ {$data['server_name']} {$data['role_name']} {$data['apply_resource']} - 新增扶持后续扶持 + 新增资源后续资源 {$data['apply_remark']} {:date('Y-m-d H:i:s',$data['create_time'])} @@ -170,7 +170,7 @@
- 导出 + 导出 {$_page|default=''}
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html index f996a2501..c95054689 100644 --- a/Application/Admin/View/TestResource/supportNumberList.html +++ b/Application/Admin/View/TestResource/supportNumberList.html @@ -33,11 +33,11 @@
- class="tabchose" href="{:U('supportNumberList',array('type'=>1))}">扶持号管理 + class="tabchose" href="{:U('supportNumberList',array('type'=>1))}">资源管理
-

扶持号管理

+

资源管理

-

说明：此功能是扶持号管理<的功能

+

说明：此功能是资源管理的功能

说明：此功是查看并管理混服申请的功能

 @@ -101,7 +101,7 @@ 角色名称 设备信息 状态 - 创建时间 + 创建时间 操作