Merge branch 'feature/oa1215' into dev

Application/Sdk/Controller/FengHuoApi2Controller.class.php

@@ -339,14 +339,14 @@ class FengHuoApi2Controller extends GetInfoBaseController{
     // 下载记录
     public function downloadLog(){
         $where = [];
-//        $time = $_REQUEST['time'];
+        $time = $_REQUEST['time'];
         $page = $_REQUEST['page'];
         $pageSize = $_REQUEST['page_size'];
 
         //时间区间
-//        if (isset($time)) {
+        if (isset($time)) {
-//            $where['login_time'] = array('between',[$time,$time+86399]);
+            $where['create_time'] = array('between',[$time,$time+86399]);
-//        }
+        }
 //        第几页数据
         $page = intval($page);
         $page = $page ? $page : 1; //默认显示第一页数据
@@ -387,6 +387,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
             $data[$k]['game_name'] = $game['game_name'];
             $data[$k]['ip'] = $v['ip'];
             $data[$k]['create_time'] = $v['create_time'];
+            $data[$k]['create_time1'] = date('Y-m-d H:i:s', $v['create_time']);
         }
 
         if($data){
@@ -399,6 +400,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
             $result = [
                 'ResultCode' => 1,
                 'ResultMessage' => "没有数据，换个条件试试吧",
+                'Data' => []
             ];
         }