Merge pull request 'feature/0207zgc' (#146) from feature/0207zgc into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/146

Application/Home/Controller/DownloadController.class.php

@@ -1488,12 +1488,12 @@ class DownloadController extends BaseController
         } elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
             $map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
         }else {
-            $nowTime = date('Y-m-d');
+//            $nowTime = date('Y-m-d');
-            $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
+//            $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
-            $initEndTime = date('Y-m-d');
+//            $initEndTime = date('Y-m-d');
-            $initBegTime = strtotime($initBegTime);
+//            $initBegTime = strtotime($initBegTime);
-            $initEndTime = strtotime($initEndTime);
+//            $initEndTime = strtotime($initEndTime);
-            $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]];
+//            $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]];
         }
         
         if ($payedBegTime) {

Application/Home/Controller/QueryController.class.php

@@ -241,6 +241,8 @@ class QueryController extends BaseController
         $parameter['row'] = $row;
         $parameter['begtime'] = $initBegTime;
         $parameter['endtime'] = $initEndTime;
+        $parameter['payed_begtime'] = I("payed_begtime", '');
+        $parameter['payed_endtime'] = I("payed_endtime", '');
         $parameter['relation_game_id'] = $relationGameId;
         $parameter['sdk_version'] = $sdkVersion;
         $parameter['server_id'] = $serverId;
@@ -797,7 +799,7 @@ class QueryController extends BaseController
 
         $timeout = 0;
         $records = [];
-        if (intval($endTime - $beginTime) / (24 * 3600) <= 7) {
+        if (intval($endTime - $beginTime) / (24 * 3600) <= 32) {
             $userRepository = new UserRepository();
             $spendRepository = new SpendRepository();
             $payGameCountList = $spendRepository->getPayGameCountGroupByDay($params);