冲突

Application/Home/Controller/DownloadController.class.php

@@ -1246,7 +1246,8 @@ class DownloadController extends BaseController {
         $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
         $begTime = strtotime($initBegTime);
         $endTime = strtotime($initEndTime);
-        if(!empty(I('endtime'))) { $endTime = $endTime + 24 *3600; }
+        $endTime += 3600 * 24;
+        
         $map1['chain'] = ['like','%'.'/'.PID.'/'.'%'];
         $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select();
         $childPromoteIds = '';
@@ -2964,11 +2965,7 @@ class DownloadController extends BaseController {
         $field = $fieldUC . ',' . $fieldUI;
         $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
         ->field($field)
-<<<<<<< HEAD
         ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
-=======
-        ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
->>>>>>> hotfix/changepack
         ->where($map)
         ->group('uc.role_id,uc.server_id,uc.game_id')
         ->buildSql();
@@ -2978,11 +2975,7 @@ class DownloadController extends BaseController {
         $total = [];
         $total = M('user_play_data_count', 'tab_')->alias('uc')
             ->field($fieldUC)
-<<<<<<< HEAD
             ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
-=======
-            ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
->>>>>>> hotfix/changepack
             ->where($map)
             ->find();
          foreach ($roles as $role) {