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 @@