Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/ExportController.class.php

@@ -1645,11 +1645,18 @@ class ExportController extends Controller
         $arraypage=$page;
         $row = 10;
         $user=M('User','tab_');
-        $map['fgame_id']=array('gt',0);$map['puid'] = 0;
+        $map['fgame_id']=array('egt',0);$map['puid'] = 0;
         if(isset($_REQUEST['timestart'])&&isset($_REQUEST['timeend'])){
             $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['timestart']),strtotime($_REQUEST['timeend'])+24*60*60-1));
             unset($_REQUEST['timestart']);unset($_REQUEST['timeend']);
+        } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) {
+            $map['register_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())];
+            unset($_REQUEST['timestart']);
+        } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) {
+            $map['register_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399];
+            unset($_REQUEST['timeend']);
         }
+
         if(isset($_REQUEST['start'])&&isset($_REQUEST['end'])){
             $map['register_time'] =array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
             unset($_REQUEST['start']);unset($_REQUEST['end']);
@@ -1668,13 +1675,18 @@ class ExportController extends Controller
 			    count(IF(register_time '.$mounth.',1,null)) as mounth')
             ->where($map)
             ->group('fgame_id')
-            ->order('count desc')
+            ->order('count desc,register_time')
             ->select();
+
         $count=count($data);
         foreach ($data as $key => $value) {
             static $i=0;
             $i++;
             $data[$key]['rand']=$i;
+
+            if ($data[$key]['fgame_id'] == 0) {
+                $data[$key]['fgame_name'] = '其他注册';
+            }
         }
         $total=A('Platform')->data_total($data);
         if($_REQUEST['data_order']!=''){
@@ -2099,7 +2111,18 @@ class ExportController extends Controller
         if(isset($_REQUEST['timestart'])&&isset($_REQUEST['timeend'])){
             $map['pay_time'] =array('BETWEEN',array(strtotime($_REQUEST['timestart']),strtotime($_REQUEST['timeend'])+24*60*60-1));
             unset($_REQUEST['timestart']);unset($_REQUEST['timeend']);
+        } elseif (!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) {
+            $map['create_time'] = ['between', array(strtotime($_REQUEST['timestart']), time())];
+            $pay_time = " between " . strtotime($_REQUEST['timestart']) . " and " . time() . " ";
+            unset($_REQUEST['timestart']);
+        } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) {
+            $map['create_time'] = ['elt', strtotime($_REQUEST['timeend']) + 86399];
+            $pay_time = " between 0 and " . (strtotime($_REQUEST['timeend']) + 86399) . " ";
+            unset($_REQUEST['timeend']);
+        } else {
+            $pay_time = " between 0 and " . time();
         }
+
         if(isset($_REQUEST['start'])&&isset($_REQUEST['end'])){
             $map['pay_time'] =array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
             unset($_REQUEST['start']);unset($_REQUEST['end']);
@@ -2109,82 +2132,82 @@ class ExportController extends Controller
 //            unset($_REQUEST['promote_id']);
 //        }
         $map1['pay_status'] = $map['pay_status']=1;
-        $map1['pay_way'] = $map['pay_way'] = array('gt', 0);
+//        $map1['pay_way'] = $map['pay_way'] = array('gt', 0);
         $today=total(1);
         $week=total(2);
         $mounth=total(3);
-        $map1['pay_way'] = $map['pay_way'] = array('gt',0);
-        $bindrecharge_data = M('bind_recharge','tab_')
-            ->field('max(id) as id,promote_account,promote_id,create_time as ordertime,date_format(FROM_UNIXTIME(create_time),"%Y-%m-%d") AS time, sum(real_amount) as count,
-			    sum(IF(create_time '.$today.',real_amount,0)) as today,
-			    sum(IF(create_time '.$week.',real_amount,0)) as week,
-			    sum(IF(create_time '.$mounth.',real_amount,0)) as mounth')
-            ->where($map1)
-            ->group('promote_id')
-            ->select(false);
-
-        $deposit_data = M('deposit','tab_')
-            ->field('max(id) as id,promote_account,promote_id,create_time as ordertime,date_format(FROM_UNIXTIME(create_time),"%Y-%m-%d") AS time, sum(pay_amount) as count,
-			    sum(IF(create_time '.$today.',pay_amount,0)) as today,
-			    sum(IF(create_time '.$week.',pay_amount,0)) as week,
-			    sum(IF(create_time '.$mounth.',pay_amount,0)) as mounth')
-            ->where($map1)
-            ->group('promote_id')
-            ->select(false);
-        if(isset($_REQUEST['game_name'])){
-            $map['game_name'] = $_REQUEST['game_name'];
-            if(isset($_REQUEST['server_id'])){
-                $map['server_name'] = $_REQUEST['server_id'];
-                unset($_REQUEST['server_id']);
-            }
-            $data=$spend
-                ->field('max(id) as id,promote_account,promote_id,pay_time as ordertime,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count,
-                    sum(IF(pay_time '.$today.',pay_amount,0)) as today,
-                    sum(IF(pay_time '.$week.',pay_amount,0)) as week,
-                    sum(IF(pay_time '.$mounth.',pay_amount,0)) as mounth')
-                ->where($map)
-                ->group('promote_id')
-                ->select(false);
-        }else{
-            $data=$spend
-                ->field('max(id) as id,promote_account,promote_id,pay_time as ordertime,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, sum(pay_amount) as count,
-    			    sum(IF(pay_time '.$today.',pay_amount,0)) as today,
-    			    sum(IF(pay_time '.$week.',pay_amount,0)) as week,
-    			    sum(IF(pay_time '.$mounth.',pay_amount,0)) as mounth')
-                ->where($map)
-                ->union(' ('.$bindrecharge_data.') ')
-                ->union(' ('.$deposit_data.') ')
-                ->group('promote_id')
-                ->select(false);
-        }
-        $promote_map = "tp1.`chain` = '/'";
+        unset( $map['create_time']);
+
+        //获取所有会长
+        $promote_map = "`chain` = '/'";
         if (isset($_REQUEST['promote_id'])) {
-            $promote_map = "tp1.`id` = {$_REQUEST['promote_id']}";
-            unset($_REQUEST['promote_id']);
+            $promote_map = "`chain` =  '%/{$_REQUEST['promote_id']}/%' OR id = {$_REQUEST['promote_id']}";
         }
-        $data = $spend->field('t.pid as promote_id,t.promote_account,sum(a.count) AS count,sum(a.today) AS today,sum(a. WEEK) AS WEEK,sum(a.mounth) AS mounth')
-            ->join("INNER JOIN (SELECT tp2.*, tp1.id AS pid, tp1.account as promote_account FROM tab_promote tp1 LEFT JOIN tab_promote tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') where $promote_map ) AS t ON promote_id = t.id")
-            ->where($condition)->table('(' . $data . ') as a')->group('t.pid')->order('count desc,a.ordertime')->select();
-        $count=count($data);
-        foreach ($data as $key => $value) {
-            static $i=0;
-            $i++;
-            $data[$key]['rand']=$i;
-            if($data[$key]['promote_id']=='0'){
-                unset($data[$key]);
+
+        $promote =  M("promote","tab_")->field("id,account")->page($page,$row)->where($promote_map)->select();
+        $pcount = M("promote","tab_")->field("count(*) acount")->where($promote_map)->find()['acount'];
+
+        // var_dump( $promote);
+        $data =array();
+        for ($i=0; $i < count($promote); $i++) {
+            # code...
+            $proid =  M("promote","tab_")->field("id")->where("`chain` like '%/{$promote[$i]['id']}/%'")->select();
+            $str = '';
+            for($k=0; $k<count($proid); $k++){
+                # code...
+                $str .= ($proid[$k]['id'].",");
+            }
+            $str .= "{$promote[$i]['id']}";
+            $map['promote_id'] = array("in",$str);
+            if (isset($_REQUEST['game_name'])) {
+                $map['game_name'] = $_REQUEST['game_name'];
+                if (isset($_REQUEST['server_id'])) {
+                    $map['server_name'] = $_REQUEST['server_id'];
+                    unset($_REQUEST['server_id']);
+                }
+                $dbdata = $spend
+                    ->field('
+                   floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count,
+                   floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100)  as today,
+                   floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100)  as week,
+                   floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
+                    ->where($map)
+                    ->where("pay_time".$pay_time)
+                    ->find();
+                $dbdata['promote_account'] = $promote[$i]['account'];
+                $dbdata['promote_id'] = $promote[$i]['id'];
+            } else {
+                $dbdata = $spend
+                    ->field(' 
+                   floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count,
+                   floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100)  as today,
+                   floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100)  as week,
+                   floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
+                    ->where($map)
+                    ->where("pay_time".$pay_time)
+                    ->find();
+                $dbdata['promote_account'] = $promote[$i]['account'];
+                $dbdata['promote_id'] = $promote[$i]['id'];
             }
+            $data[] = $dbdata;
         }
-        $total=A('Platform')->data_total($data);
-        if($_REQUEST['data_order']!=''){
-            $data_order=reset(explode(',',$_REQUEST['data_order']));
-            $data_order_type=end(explode(',',$_REQUEST['data_order']));
+        $count = count($data);
+        foreach ($data as $key => $value) {
+            $value['count'] ?: 0;
+            $value['today'] ?: 0;
+            $value['week'] ?: 0;
+            $value['mounth'] ?: 0;
+            static $i = 0;
+            $i++;
+            $data[$key]['rand'] = $i;
+            $data[$key]['count'] = $value['count'] / 100;
+            $data[$key]['today'] = $value['today'] / 100;
+            $data[$key]['week'] = $value['week'] / 100;
+            $data[$key]['mounth'] = $value['mounth'] / 100;
         }
 
-        $data=my_sort($data,$data_order_type,(int)$data_order);
-        $size=$row;//每页显示的记录数
-        $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
-        //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
-        $data = array_slice($data, ($arraypage-1)*$size, $size);
+        $total = $this->data_total($data);
+
         $xlsName = $_REQUEST['xlsname']?$_REQUEST['xlsname']:'推广员充值统计';
         $xlsCell = array(
             array('promote_id', "推广员账号"),
@@ -2210,6 +2233,15 @@ class ExportController extends Controller
         $this->exportExcel($xlsName, $xlsCell, $xlsData);
     }
 
+    public function data_total($data)
+    {
+        $total['sum_count'] = array_sum(array_column($data, 'count'));
+        $total['sum_today'] = array_sum(array_column($data, 'today'));
+        $total['sum_week'] = array_sum(array_column($data, 'week'));
+        $total['sum_mounth'] = array_sum(array_column($data, 'mounth'));
+        return $total;
+    }
+
     public function userretention_export($p = 0)
     {
         $request=$_REQUEST;

Application/Admin/Controller/PromoteController.class.php

@@ -100,7 +100,8 @@ unset($_REQUEST['parent_id']);
                 }
             }
 
-            $promote =  D(self::model_name)->field('id,account')->where(['oa_associated' => 0])->order('id DESC')->select();
+            // $promote =  D(self::model_name)->field('id,account')->where(['oa_associated' => 0])->order('id DESC')->select(); //只获取之前未关联
+            $promote =  D(self::model_name)->field('id,account')->order('id DESC')->select(); //全部重新获取
             $oa_data = array_column($oa_data, 'platform_account');
             foreach($promote as $k => $v) {
                 $v['account'] = trim($v['account']);
@@ -115,10 +116,10 @@ unset($_REQUEST['parent_id']);
         if(I('oa_associated',-1) == -1) {
             foreach($list_data as $k => $v)
             {
-                $list_data[$k]['account'] = trim($v['account']);
-                if($v['oa_associated'] != 1) {
-                    $oa_data[] = $list_data[$k]['account'];
-                }
+                // $list_data[$k]['account'] = trim($v['account']);
+                // if($v['oa_associated'] != 1) {
+                $oa_data[] = trim($v['account']);
+                // }
             }
             if(!empty($oa_data))
             {

Application/Admin/Controller/access_data_foldline.txt

@@ -1 +1 @@
-{"news":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":2},{"time":"20:00","count":1},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"sum":{"news":3,"active":4,"player":0,"money":0},"active":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":3},{"time":"20:00","count":1},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"player":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"money":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}]}
+{"news":[{"time":"0:00","count":6},{"time":"1:00","count":9},{"time":"2:00","count":7},{"time":"3:00","count":11},{"time":"4:00","count":16},{"time":"5:00","count":7},{"time":"6:00","count":9},{"time":"7:00","count":11},{"time":"8:00","count":14},{"time":"9:00","count":40},{"time":"10:00","count":58},{"time":"11:00","count":86},{"time":"12:00","count":41},{"time":"13:00","count":55},{"time":"14:00","count":194},{"time":"15:00","count":180},{"time":"16:00","count":121},{"time":"17:00","count":98},{"time":"18:00","count":120},{"time":"19:00","count":147},{"time":"20:00","count":146},{"time":"21:00","count":124},{"time":"22:00","count":93},{"time":"23:00","count":56}],"sum":{"news":1649,"active":8210,"player":1715,"money":226618},"active":[{"time":"0:00","count":967},{"time":"1:00","count":343},{"time":"2:00","count":176},{"time":"3:00","count":135},{"time":"4:00","count":118},{"time":"5:00","count":177},{"time":"6:00","count":465},{"time":"7:00","count":661},{"time":"8:00","count":622},{"time":"9:00","count":547},{"time":"10:00","count":480},{"time":"11:00","count":414},{"time":"12:00","count":326},{"time":"13:00","count":237},{"time":"14:00","count":354},{"time":"15:00","count":328},{"time":"16:00","count":215},{"time":"17:00","count":219},{"time":"18:00","count":256},{"time":"19:00","count":335},{"time":"20:00","count":274},{"time":"21:00","count":244},{"time":"22:00","count":197},{"time":"23:00","count":120}],"player":[{"time":"0:00","count":211},{"time":"1:00","count":84},{"time":"2:00","count":29},{"time":"3:00","count":25},{"time":"4:00","count":16},{"time":"5:00","count":24},{"time":"6:00","count":32},{"time":"7:00","count":56},{"time":"8:00","count":71},{"time":"9:00","count":66},{"time":"10:00","count":63},{"time":"11:00","count":69},{"time":"12:00","count":58},{"time":"13:00","count":62},{"time":"14:00","count":50},{"time":"15:00","count":99},{"time":"16:00","count":68},{"time":"17:00","count":61},{"time":"18:00","count":77},{"time":"19:00","count":157},{"time":"20:00","count":107},{"time":"21:00","count":101},{"time":"22:00","count":74},{"time":"23:00","count":55}],"money":[{"time":"0:00","count":"31554.00"},{"time":"1:00","count":"4117.00"},{"time":"2:00","count":"1839.00"},{"time":"3:00","count":"4513.00"},{"time":"4:00","count":"1008.00"},{"time":"5:00","count":"1981.00"},{"time":"6:00","count":"1270.00"},{"time":"7:00","count":"1906.00"},{"time":"8:00","count":"6683.00"},{"time":"9:00","count":"6119.00"},{"time":"10:00","count":"8974.00"},{"time":"11:00","count":"14147.00"},{"time":"12:00","count":"9775.00"},{"time":"13:00","count":"11908.00"},{"time":"14:00","count":"6781.00"},{"time":"15:00","count":"12626.00"},{"time":"16:00","count":"6742.00"},{"time":"17:00","count":"8303.00"},{"time":"18:00","count":"8804.00"},{"time":"19:00","count":"23476.00"},{"time":"20:00","count":"17464.00"},{"time":"21:00","count":"16899.00"},{"time":"22:00","count":"13143.00"},{"time":"23:00","count":"6586.00"}]}

Application/Home/Controller/DownloadController.class.php

@@ -1295,13 +1295,14 @@ class DownloadController extends BaseController {
         $map = ['promote_id' => ['in', $ids]];
         $subMap = ['promote_id' => ['in', $ids]];
         
-        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;
             }
             $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true);
-
             $map['game_id'] = ['in', $gameId1];
             $subMap['game_id'] = ['in', $gameId1];
         }
@@ -1416,22 +1417,24 @@ class DownloadController extends BaseController {
         $map['parentsinfo'] = json_encode($parent,FALSE);;
         $map['currentDisplay'] = $currentDisplay;
         $map['ids'] = $ids;
-        if ($gameId > 0) {
-            $gameMap['relation_game_id'] = $gameId;
-            if ($sdkVersion > 0) {
+        if ($gameId != 0 || $sdkVersion != 0) {
+            if ($gameId != 0) {
+                $gameMap['relation_game_id'] = $gameId;
+            }
+            if ($sdkVersion != 0) {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId1 = M('game', 'tab_')->where($gameMap)->getField('id', true);
-            $params['game_id'] = ['in', $gameId1];
+            $map['game_id'] = ['in', $gameId1];
         }
         if ($serverId > 0) {
-            $params['server_id'] = $serverId;
+            $map['server_id'] = $serverId;
         }
         if ($sdkVersion > 0) {
-            $params['sdk_version'] = $sdkVersion;
+            $map['sdk_version'] = $sdkVersion;
         }
         if ($status > 0) {
-            $params['lock_status'] = $status;
+            $map['lock_status'] = $status;
         }
         list($beginTime, $endTime) = $this->getBetweenTime($time);
         $map['begin_time'] = $beginTime;
@@ -1513,9 +1516,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 +1637,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 +1665,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 +1864,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 +1884,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 +1893,6 @@ class DownloadController extends BaseController {
                     $gameIds[] = $list['game_id'];
                 }
                 $params['game_ids'] = $gameIds;
-
                 $userRepository = new UserRepository();
                 $spendRepository = new SpendRepository();
                 $roleNumList = $userRepository->getCreateRoleCountByGame($params);//创角数

Application/Home/Controller/QueryController.class.php

@@ -1633,8 +1633,10 @@ class QueryController extends BaseController
             $map['_string'] = '1<>1';
         }
 
-        if ($relationGameId != 0) {
-            $gameMap['relation_game_id'] = $relationGameId;
+        if ($relationGameId != 0 || $sdkVersion != 0) {
+            if ($relationGameId != 0) {
+                $gameMap['relation_game_id'] = $relationGameId;
+            }
             if ($sdkVersion != 0) {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
@@ -1743,8 +1745,10 @@ class QueryController extends BaseController
             $map = ['uc.promote_id' => ['in', $ids]];
             $subMap = ['promote_id' => ['in', $ids]];
 
-            if ($relationGameId != 0) {
-                $gameMap['relation_game_id'] = $relationGameId;
+            if ($relationGameId != 0 || $sdkVersion != 0) {
+                if ($relationGameId != 0) {
+                    $gameMap['relation_game_id'] = $relationGameId;
+                }
                 if ($sdkVersion != 0) {
                     $gameMap['sdk_version'] = $sdkVersion;
                 }
@@ -1998,9 +2002,11 @@ class QueryController extends BaseController
             'isContainSubs' => true,
             'basicPromotes' => $basicPromotes,
         ];
-        if ($relationGameId > 0) {
-            $gameMap['relation_game_id'] = $relationGameId;
-            if ($sdkVersion > 0) {
+        if ($relationGameId != 0 || $sdkVersion != 0) {
+            if ($relationGameId != 0) {
+                $gameMap['relation_game_id'] = $relationGameId;
+            }
+            if ($sdkVersion != 0) {
                 $gameMap['sdk_version'] = $sdkVersion;
             }
             $gameId = M('game', 'tab_')->where($gameMap)->getField('id', true);