From db80c32938b3981999a4051f2cec6cb15c003154 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Sun, 29 Sep 2019 15:41:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=A6=82=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/QueryController.class.php | 32 ++++++++++++-------
 .../Home/View/default/Query/dailySummary.html |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index fea7738a3..f4169ec76 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1052,6 +1052,14 @@ class QueryController extends BaseController
             $summaryData['spend_all_amount'][] = $list['spend_all_amount'];
         }
 
+        $summaryData['date'] = array_reverse($summaryData['date']);
+        $summaryData['role_num'] = array_reverse($summaryData['role_num']);
+        $summaryData['user_num'] = array_reverse($summaryData['user_num']);
+        $summaryData['new_user_num'] = array_reverse($summaryData['new_user_num']);
+        $summaryData['new_device_num'] = array_reverse($summaryData['new_device_num']);
+        $summaryData['spend_user_num'] = array_reverse($summaryData['spend_user_num']);
+        $summaryData['spend_all_amount'] = array_reverse($summaryData['spend_all_amount']);
+
         $serverData = $this->getServer(I('relation_game_id'), I('sdk_version'));
 
         $thisParentPromoteId = getParentPromoteId(PID);//本账号上级渠道ID
@@ -1657,13 +1665,13 @@ class QueryController extends BaseController
             $map['play_time'] = ['between', [$playTimeBegin, $playTimeEnd]];
         }
         if ($isSelf) {
-            $map['promote_id'] =  $promote['id'];
+            $map['promote_id'] = $promote['id'];
         } else {
             if ($headmanPromoteId != 0) {
-                $map['promote_id'] =  $headmanPromoteId;
+                $map['promote_id'] = $headmanPromoteId;
             }
             if ($promoteId != 0) {
-                $map['promote_id'] =  $promoteId;
+                $map['promote_id'] = $promoteId;
             }
         }
         $query = M('user_play_info', 'tab_')->where($map);
@@ -1723,22 +1731,22 @@ class QueryController extends BaseController
             $map['sdk_version'] = $sdkVersion;
         }
         if ($isSelf) {
-            $map['promote_id'] =  $promote['id'];
-            $spendMap['promote_id'] =  $promote['id'];
+            $map['promote_id'] = $promote['id'];
+            $spendMap['promote_id'] = $promote['id'];
         } else {
             if ($headmanPromoteId != 0) {
-                $map['promote_id'] =  $headmanPromoteId;
-                $spendMap['promote_id'] =  $headmanPromoteId;
+                $map['promote_id'] = $headmanPromoteId;
+                $spendMap['promote_id'] = $headmanPromoteId;
             }
             if ($promoteId != 0) {
-                $map['promote_id'] =  $promoteId;
-                $spendMap['promote_id'] =  $promoteId;
+                $map['promote_id'] = $promoteId;
+                $spendMap['promote_id'] = $promoteId;
             }
         }
         $query = M('user_play_info', 'tab_')->where($map);
         list($roles, $pagination, $count) = $this->paginate($query);
         $roleIds = array_column($roles, 'role_id');
-        
+
         $spendMap['pay_status'] = 1;
         $spendMap['pay_game_status'] = 1;
         if (count($roleIds) > 0) {
@@ -1771,13 +1779,13 @@ class QueryController extends BaseController
                 'server_name' => $role['server_name'],
                 'recharge_cost' => isset($allRecords[$role['role_id']]) ? round(floatval($allRecords[$role['role_id']]['cost']), 2) : 0,
                 'recharge_count' => isset($allRecords[$role['role_id']]) ? $allRecords[$role['role_id']]['count'] : 0,
-                'recharge_cost_today' =>isset($todayRecords[$role['role_id']]) ? round(floatval($todayRecords[$role['role_id']]['cost']), 2) : 0,
+                'recharge_cost_today' => isset($todayRecords[$role['role_id']]) ? round(floatval($todayRecords[$role['role_id']]['cost']), 2) : 0,
                 'play_time' => $role['play_time'],
                 'play_ip' => $role['play_ip'],
                 'promote_id' => $role['promote_id'],
                 'promote_account' => $role['promote_account'],
                 'sdk_version' => $role['sdk_version'],
-                'unlogin_day' => intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $role['play_time']))) / (24*3600) )
+                'unlogin_day' => intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $role['play_time']))) / (24 * 3600))
             ];
         }
 
diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html
index 274f6b48e..786525d74 100644
--- a/Application/Home/View/default/Query/dailySummary.html
+++ b/Application/Home/View/default/Query/dailySummary.html
@@ -374,7 +374,7 @@
                               color: "#999"
                           },
                           alignWithLabel: true,
-                          interval: 0,
+                          interval: 1,
                       },
                       axisLine: {
                           lineStyle: {