From 9169a2084b7d2b0e70f6728d68c9d099611f0823 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 29 Oct 2019 15:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=90=8E=E5=8F=B0->=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86->=E6=AF=8F=E6=97=A5=E6=A6=82?= =?UTF-8?q?=E5=86=B5|=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB->=E5=90=88?= =?UTF-8?q?=E8=AE=A1=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 | 52 ++++++++++++++----- .../Home/View/default/Query/dailySummary.html | 12 ++--- .../Home/View/default/Query/summary.html | 12 ++--- 3 files changed, 52 insertions(+), 24 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 88e859ff5..56ce91d23 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1135,6 +1135,13 @@ class QueryController extends BaseController $dateTime = strtotime('-1 day', $dateTime); } + $allData['role_num'] = 0; + $allData['user_num'] = 0; + $allData['new_user_num'] = 0; + $allData['new_device_num'] = 0; + $allData['new_ip_num'] = 0; + $allData['login_user_num'] = 0; + $allData['spend_user_num'] = 0; $allData['spend_num'] = 0; $allData['spend_all_amount'] = 0; $allData['spend_cash'] = 0; @@ -1264,13 +1271,20 @@ class QueryController extends BaseController $list['spend_discount'] = 0;//折扣币 $list['spend_voucher'] = 0;//代金券 + $allData['role_num'] += $list['role_num']; + $allData['user_num'] += $list['user_num']; + $allData['new_user_num'] += $list['new_user_num']; + $allData['new_device_num'] += $list['new_device_num']; + $allData['new_ip_num'] += $list['new_ip_num']; + $allData['login_user_num'] += $list['login_user_num']; + $allData['spend_user_num'] += $list['spend_user_num']; $allData['spend_num'] += $list['spend_num']; - $allData['spend_all_amount'] += $list['spend_all_amount']; - $allData['spend_cash'] += $list['spend_cash']; - $allData['spend_generic'] += $list['spend_generic']; - $allData['spend_binding'] += $list['spend_binding']; - $allData['spend_discount'] += $list['spend_discount']; - $allData['spend_voucher'] += $list['spend_voucher']; + $allData['spend_all_amount'] = bcadd($allData['spend_all_amount'], $list['spend_all_amount'], 2); + $allData['spend_cash'] = bcadd($allData['spend_cash'], $list['spend_cash'], 2); + $allData['spend_generic'] = bcadd($allData['spend_generic'], $list['spend_generic'], 2); + $allData['spend_binding'] = bcadd($allData['spend_binding'], $list['spend_binding'], 2); + $allData['spend_discount'] = bcadd($allData['spend_discount'], $list['spend_discount'], 2); + $allData['spend_voucher'] = bcadd($allData['spend_voucher'], $list['spend_voucher'], 2); $summaryData['role_num'][] = $list['role_num']; $summaryData['user_num'][] = $list['user_num']; @@ -1457,6 +1471,13 @@ class QueryController extends BaseController $parameter['begtime'] = $initBegTime; $parameter['endtime'] = $initEndTime; + $allData['role_num'] = 0; + $allData['user_num'] = 0; + $allData['new_user_num'] = 0; + $allData['new_device_num'] = 0; + $allData['new_ip_num'] = 0; + $allData['login_user_num'] = 0; + $allData['spend_user_num'] = 0; $allData['spend_num'] = 0; $allData['spend_all_amount'] = 0; $allData['spend_cash'] = 0; @@ -1541,13 +1562,20 @@ class QueryController extends BaseController $list['spend_discount'] = 0;//折扣币 $list['spend_voucher'] = 0;//代金券 + $allData['role_num'] += $list['role_num']; + $allData['user_num'] += $list['user_num']; + $allData['new_user_num'] += $list['new_user_num']; + $allData['new_device_num'] += $list['new_device_num']; + $allData['new_ip_num'] += $list['new_ip_num']; + $allData['login_user_num'] += $list['login_user_num']; + $allData['spend_user_num'] += $list['spend_user_num']; $allData['spend_num'] += $list['spend_num']; - $allData['spend_all_amount'] += $list['spend_all_amount']; - $allData['spend_cash'] += $list['spend_cash']; - $allData['spend_generic'] += $list['spend_generic']; - $allData['spend_binding'] += $list['spend_binding']; - $allData['spend_discount'] += $list['spend_discount']; - $allData['spend_voucher'] += $list['spend_voucher']; + $allData['spend_all_amount'] = bcadd($allData['spend_all_amount'], $list['spend_all_amount'], 2); + $allData['spend_cash'] = bcadd($allData['spend_cash'], $list['spend_cash'], 2); + $allData['spend_generic'] = bcadd($allData['spend_generic'], $list['spend_generic'], 2); + $allData['spend_binding'] = bcadd($allData['spend_binding'], $list['spend_binding'], 2); + $allData['spend_discount'] = bcadd($allData['spend_discount'], $list['spend_discount'], 2); + $allData['spend_voucher'] = bcadd($allData['spend_voucher'], $list['spend_voucher'], 2); } } diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html index 725d12058..8967cc922 100644 --- a/Application/Home/View/default/Query/dailySummary.html +++ b/Application/Home/View/default/Query/dailySummary.html @@ -212,12 +212,12 @@ 合计 - -- - -- - --|-- - -- - -- - -- + {$allData.role_num} + {$allData.user_num} + {$allData.new_user_num}|{$allData.new_device_num} + {$allData.new_ip_num} + {$allData.login_user_num} + {$allData.spend_user_num} {$allData.spend_num} {$allData.spend_all_amount} {$allData.spend_cash} diff --git a/Application/Home/View/default/Query/summary.html b/Application/Home/View/default/Query/summary.html index c6c56ef07..0369db376 100644 --- a/Application/Home/View/default/Query/summary.html +++ b/Application/Home/View/default/Query/summary.html @@ -203,12 +203,12 @@ 合计 -- - -- - -- - --|-- - -- - -- - -- + {$allData.role_num} + {$allData.user_num} + {$allData.new_user_num}|{$allData.new_device_num} + {$allData.new_ip_num} + {$allData.login_user_num} + {$allData.spend_user_num} {$allData.spend_num} {$allData.spend_all_amount} {$allData.spend_cash}