修改冲突

Application/Base/Service/GameSourceService.class.php

@@ -9,7 +9,7 @@ use GuzzleHttp\Client;
 
 class GameSourceService {
 
-    const IS_FIXED_IOS13 = true;
+    const IS_FIXED_IOS13 = false;
     const DEBUG = true;
 
     public function __construct()

Application/Home/Controller/DownloadController.class.php

@@ -1225,7 +1225,7 @@ class DownloadController extends BaseController {
               //  $this->ajaxReturn(array("status" => -1, "msg" => "添加导出日志失败", 'ret' => $res));
              $this->error('添加下载失败');
             }
-       $this->success('添加下载成功',U('listsIndex'));
+       $this->success('添加下载成功,导出数据不包含当天',U('listsIndex'));
      }
      
      public function userRecharge_data_export() {
@@ -1246,8 +1246,7 @@ class DownloadController extends BaseController {
         $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
         $begTime = strtotime($initBegTime);
         $endTime = strtotime($initEndTime);
-        $endTime += 3600 * 24;
-        
+        if(!empty(I('endtime'))) { $endTime = $endTime + 24 *3600; }
         $map1['chain'] = ['like','%'.'/'.PID.'/'.'%'];
         $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select();
         $childPromoteIds = '';
@@ -2965,7 +2964,11 @@ 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();
@@ -2975,7 +2978,11 @@ 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) {