From 918a48714122134f0f1ee82a517ff5baeff72cf0 Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Tue, 26 Nov 2019 22:22:25 +0800
Subject: [PATCH] bug

---
 .../Controller/DownloadController.class.php     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 22d8a87ac..c751ca580 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -1513,9 +1513,10 @@ class DownloadController extends BaseController {
             $map['_string'] = '1<>1';
         }
         
-
-        if ($gameId != 0) {
-            $gameMap['relation_game_id'] = $gameId;
+        if ($gameId != 0 || $sdkVersion != 0) {
+            if ($gameId != 0) {
+                $gameMap['relation_game_id'] = $gameId;
+            }
             if ($sdkVersion != 0) {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
@@ -1633,7 +1634,7 @@ class DownloadController extends BaseController {
             array_push($ids,PID);
             
         }
-        array_push($ids,$queryPromote['id']);
+       // array_push($ids,$queryPromote['id']);
         if (!empty($ids)) {
             $map['tab_apply.promote_id'] = ['in',$ids];
             
@@ -1661,7 +1662,7 @@ class DownloadController extends BaseController {
             $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]];
         }
         if(!empty($begtime) && !empty($endtime)) {
-            $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime)]];
+            $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24 -1]];
         }
         $serverField = '';
         $serverJoin = '';
@@ -1860,12 +1861,12 @@ class DownloadController extends BaseController {
         $begTime = strtotime($initBegTime);
         $endTime = strtotime($initEndTime);
         $params['begin_time'] = $begTime;
-        $params['end_time'] = $endTime -1;
+        $params['end_time'] = $endTime +3600 * 24 -1;
          if(!empty($map['apply_time'][1])) {
              $begTime = $map['apply_time'][1][0];
              $endTime = $map['apply_time'][1][1];
              $params['begin_time'] = $begTime;
-             $params['end_time'] = $endTime;
+             $params['end_time'] = $endTime + 3600 * 24 -1;
              unset($map['apply_time']);
          }
         if(!empty($map['tab_server.server_id'])) {
@@ -1880,6 +1881,7 @@ class DownloadController extends BaseController {
             ->group('tab_apply.game_id')
             ->order('g.sort desc,g.id desc')
             ->select();
+
         $records = [];
          if (!empty($data)) {  
             if (intval($endTime - $begTime) / (24 * 3600) <= 30) {
@@ -1888,7 +1890,6 @@ class DownloadController extends BaseController {
                     $gameIds[] = $list['game_id'];
                 }
                 $params['game_ids'] = $gameIds;
-
                 $userRepository = new UserRepository();
                 $spendRepository = new SpendRepository();
                 $roleNumList = $userRepository->getCreateRoleCountByGame($params);//创角数