diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 761c20785..3bec61a7b 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1481,19 +1481,19 @@ class DownloadController extends BaseController - if (!empty(I('begtime')) && empty(I('endtime'))) { + if (!empty(I('begtime')) && empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['egt', strtotime(I('begtime'))]; } elseif (empty(I('begtime')) && !empty(I('endtime'))) { $map['tab_spend.spend_time'] = ['elt', strtotime(I('endtime')) + 86399]; } 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'); - $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); - $initEndTime = date('Y-m-d'); - $initBegTime = strtotime($initBegTime); - $initEndTime = strtotime($initEndTime); - $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; +// $nowTime = date('Y-m-d'); +// $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); +// $initEndTime = date('Y-m-d'); +// $initBegTime = strtotime($initBegTime); +// $initEndTime = strtotime($initEndTime); +// $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; } if ($payedBegTime) { diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 16993ad90..583974407 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -64,7 +64,7 @@ class QueryController extends BaseController $endTime = strtotime($initEndTime); $endTime += 3600 * 24; - $payedBegTime = I("payed_begtime", ''); + $payedBegTime = I("payed_begtime", ''); if ($payedBegTime) $payedBegTime = strtotime($payedBegTime); $payedEndTime = I("payed_endtime", ''); if ($payedEndTime) { @@ -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);