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

Application/Home/Controller/DownloadController.class.php

@@ -1203,6 +1203,7 @@ class DownloadController extends BaseController {
             $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime) + 24*3600];
         }
 
+
         $conditions = json_encode($map,TRUE);           
          $addtime = time();
          $data = [

Application/Home/Controller/QueryController.class.php

@@ -1858,7 +1858,7 @@ class QueryController extends BaseController
             }
 
             $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]];
-            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
+            $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id";
             $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
 
             $loginRecordMap['lr.create_time'] = $map['uc.create_time'];
@@ -1877,14 +1877,25 @@ class QueryController extends BaseController
             $query = M()->alias('record')
                 ->table($subQuery)
                 ->order($orderBy);
-            $total = M('user_play_data_count', 'tab_')->alias('uc')
+
+            list($records, $pagination, $count) = $this->paginate($query);
+
+            $totalQuery = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($fieldUC)
+                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id')
+                ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id,uc.id')
                 ->where($map)
+                ->buildSql();
+            $total = M()->alias('totals')
+                ->table($totalQuery)
+                ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today')
                 ->find();
 
-            list($records, $pagination, $count) = $this->paginate($query);
-
             foreach ($records as &$list) {
+                if (empty($list['user_account']) ) {
+                    $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
+                    $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                }
                 $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
                 $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
                 $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);

Application/Home/View/default/Promote/children.html

@@ -109,7 +109,7 @@
                       <?php endif;?>
                     <?php endif;?>
 
-                    <?php if(in_array($record['id'], $hasPlayerList)):?>
+                    <?php if(false && in_array($record['id'], $hasPlayerList)):?>
                       <?php if(!in_array($record['id'], $hasShiftPlayerList)):?>
                       <a href="javascript:;" class="shift-player-btn editbtn">玩家迁移</a>
                       <?php else:?>

Application/Home/View/default/Promote/mychlid.html

@@ -94,7 +94,7 @@
                       <a href="javascript:;" style="color: red;" class="cancel-shift-btn editbtn">取消渠道迁移</a>
                       <?php endif;?>
                     <?php endif;?>
-                    <?php if(in_array($vo['id'], $hasPlayerList)):?>
+                    <?php if(false && in_array($vo['id'], $hasPlayerList)):?>
                       <?php if(!in_array($vo['id'], $hasShiftPlayerList)):?>
                       <a href="javascript:;" class="shift-player-btn editbtn">玩家迁移</a>
                       <?php else:?>