Merge commit 'c1865a0f898a8809f4fc2e0ea63d6b6c58c34426' into dev

app/v1/controller/customer/ReconciliationController.php

@@ -6,7 +6,7 @@ namespace app\v1\controller\customer;
 
 use plugin\saiadmin\basic\BaseController;
 use app\v1\logic\customer\ReconciliationLogic;
-use app\v1\logic\gameLog\channelAnalysisLogic;
+use app\v1\logic\dataReport\channelAnalysisLogic;
 use support\Request;
 use support\Response;
 

app/v1/controller/gameLog/AnalyseController.php → app/v1/controller/dataReport/AnalyseController.php

@@ -2,11 +2,13 @@
 /**
  * 运营分析
  */
-namespace app\v1\controller\gameLog;
-use app\v1\logic\gameLog\AnalyseLogic;
+
+namespace app\v1\controller\dataReport;
+
+use app\v1\logic\dataReport\AnalyseLogic;
 use plugin\saiadmin\basic\BaseController;
 use support\Request;
-use support\Response;
+
 class AnalyseController extends BaseController
 {
     public function __construct()
@@ -16,41 +18,45 @@ class AnalyseController extends BaseController
     }
 
     // 注册按日
-    public function getRegDayDataList(Request $request){
+    public function getRegDayDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', '']
         ]);
         $data = $this->logic->getRegDayDataList($where);
-        $data['data'] = $this->logic->trandformListColumn($data['data'],['game']);
+        $data['data'] = $this->logic->trandformListColumn($data['data'], ['game']);
         return $this->success($data);
     }
 
     // 注册按时s
-    public function getRegHourDataList(Request $request){
+    public function getRegHourDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', '']
         ]);
         $data = $this->logic->getRegHourDataList($where);
-        $data['data'] = $this->logic->trandformListColumn($data['data'],['game']);
+        $data['data'] = $this->logic->trandformListColumn($data['data'], ['game']);
         return $this->success($data);
     }
 
     // 留存按日
-    public function getRetentionDayDataList(Request $request){
+    public function getRetentionDayDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', ''],
             ['days', '']
         ]);
         $data = $this->logic->getRetentionDayDataList($where);
-        $data['data'] = $this->logic->trandformListColumn($data['data'],['game']);
+        $data['data'] = $this->logic->trandformListColumn($data['data'], ['game']);
         return $this->success($data);
     }
 
     //数据总览
-    public function getDataOverview(Request $request){
+    public function getDataOverview(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', ''],
@@ -62,7 +68,8 @@ class AnalyseController extends BaseController
     }
 
     // 数据总览（按月）
-    public function getDataOverviewByMonth(Request $request){
+    public function getDataOverviewByMonth(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', ''],
@@ -74,18 +81,20 @@ class AnalyseController extends BaseController
     }
 
     // 收入分析
-    public function getIncomeAnalysis(Request $request){
+    public function getIncomeAnalysis(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', '']
         ]);
         $data = $this->logic->getIncomeAnalysis($where);
-        $data['data'] = $this->logic->trandformListColumn($data['data'],['game']);
+        $data['data'] = $this->logic->trandformListColumn($data['data'], ['game']);
         return $this->success($data);
     }
 
     // 付费留存
-    public function getPayRetention(Request $request){
+    public function getPayRetention(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', ''],
@@ -98,7 +107,8 @@ class AnalyseController extends BaseController
     }
 
     // 图表数据
-    public function getChartData(Request $request){
+    public function getChartData(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['compare_date1', ''],

app/v1/controller/gameLog/ChannelAnalysisController.php → app/v1/controller/dataReport/ChannelAnalysisController.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace app\v1\controller\gameLog;
-use app\v1\logic\gameLog\channelAnalysisLogic;
+namespace app\v1\controller\dataReport;
+
+use app\v1\logic\dataReport\channelAnalysisLogic;
 use plugin\saiadmin\basic\BaseController;
 use support\Request;
-use support\Response;
-class channelAnalysisController extends BaseController
+
+class ChannelAnalysisController extends BaseController
 {
     public function __construct()
     {
@@ -25,13 +26,14 @@ class channelAnalysisController extends BaseController
             ['reg_date', '']
         ]);
         $data = $this->logic->getHourDataList($where);
-        $data = $this->logic->trandformListColumn($data,['agent']);
+        $data = $this->logic->trandformListColumn($data, ['agent']);
         return $this->success($data);
 
     }
 
     // 留存数据
-    public function getActiveDataList(Request $request){
+    public function getActiveDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['media_id', ''],
@@ -45,7 +47,8 @@ class channelAnalysisController extends BaseController
     }
 
     // 渠道总览
-    public function getAgentDataList(Request $request){
+    public function getAgentDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['media_id', ''],
@@ -61,7 +64,8 @@ class channelAnalysisController extends BaseController
     }
 
     // 广告位总览
-    public function getAdSiteDataList(Request $request){
+    public function getAdSiteDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', ''],
@@ -74,12 +78,13 @@ class channelAnalysisController extends BaseController
             ['filter', '']
         ]);
         $resultData = $this->logic->getAdSiteDataList($where);
-        $data = $this->logic->trandformListColumn($resultData['data'],['agent','site','auth']);
-        return $this->success(['data'=>$data,'totalRow'=>$resultData['total']]);
+        $data = $this->logic->trandformListColumn($resultData['data'], ['agent', 'site', 'auth']);
+        return $this->success(['data' => $data, 'totalRow' => $resultData['total']]);
     }
 
     // 渠道按日分析
-    public function getAgentDayDataList(Request $request){
+    public function getAgentDayDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['reg_date', ''],
@@ -95,7 +100,8 @@ class channelAnalysisController extends BaseController
     }
 
     // ltv
-    public function getLtvDataList(Request $request){
+    public function getLtvDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['media_id', ''],
@@ -110,7 +116,8 @@ class channelAnalysisController extends BaseController
     }
 
     // ltvm
-    public function getLtvmDataList(Request $request){
+    public function getLtvmDataList(Request $request)
+    {
         $where = $request->more([
             ['game_id', ''],
             ['media_id', ''],

app/v1/controller/dataReport/MaterialController.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * 素材分析
+ */
+
+namespace app\v1\controller\dataReport;
+
+use app\v1\logic\dataReport\MaterialLogic;
+use plugin\saiadmin\basic\BaseController;
+use plugin\saiadmin\basic\BaseLogic;
+use support\Request;
+
+class MaterialController extends BaseController
+{
+    protected $baseLogic;
+
+    public function __construct()
+    {
+        $this->logic = new MaterialLogic();
+        $this->baseLogic = new BaseLogic();
+        parent::__construct();
+    }
+
+    // 素材数据总览
+    public function getMaterialList(Request $request)
+    {
+        $where = $request->more([
+            ['game_id', ''],
+            ['reg_date', ''],
+            ['author_id', ''],
+            ['media_id', ''],
+            ['cost_type', ''],
+            ['material_name', ''],
+            ['material_id', ''],
+            ['auth_id', ''],
+            ['group', ''],
+        ]);
+        $result = $this->logic->getMaterialList($where);
+        $result['data'] = $this->baseLogic->trandformListColumn($result['data'], ['auth', 'author']);
+        return $this->success($result);
+    }
+}

app/v1/controller/gameLog/UserLogController.php → app/v1/controller/dataReport/UserLogController.php

@@ -2,19 +2,18 @@
 
 // 玩家日志控制器
 
-namespace app\v1\controller\gameLog;
+namespace app\v1\controller\dataReport;
 
-use app\v1\logic\gameLog\UserLogLogic;
+use app\v1\logic\dataReport\UserLogLogic;
 use plugin\saiadmin\basic\BaseController;
 use support\Request;
-use support\Response;
 
 class UserLogController extends BaseController
 {
     public function __construct()
     {
-      $this->logic = new UserLogLogic();
-      parent::__construct();
+        $this->logic = new UserLogLogic();
+        parent::__construct();
     }
 
     // 注册日志
@@ -70,7 +69,7 @@ class UserLogController extends BaseController
             ['pay_date', ''],
         ]);
         $data = $this->logic->getRechargeDetailList($where);
-        $data['data'] = $this->logic->trandformListColumn($data['data'], ['game', 'ip', 'agent','auth', 'pay_channel']);
+        $data['data'] = $this->logic->trandformListColumn($data['data'], ['game', 'ip', 'agent', 'auth', 'pay_channel']);
         return $this->success($data);
     }
 
@@ -90,7 +89,7 @@ class UserLogController extends BaseController
             ['pay_date', ''],
         ]);
         $data = $this->logic->getRechargeRankList($where);
-       
+
         return $this->success($data);
     }
 
@@ -98,7 +97,7 @@ class UserLogController extends BaseController
     public function exportRechargeDetailList(Request $request)
     {
         $where = $request->more([
-           ['game_id', ''],
+            ['game_id', ''],
             ['media_id', ''],
             ['auth_id', ''],
             ['agent_id', ''],
@@ -115,7 +114,7 @@ class UserLogController extends BaseController
     // 角色数据
     public function getRoleDataList(Request $request)
     {
-       $where = $request->more([
+        $where = $request->more([
             ['game_id', ''],
             ['media_id', ''],
             ['site_id', ''],

app/v1/controller/gameLog/MaterialController.php

@@ -1,40 +0,0 @@
-<?php
-/**
- * 渠道分析
- */
-namespace app\v1\controller\gameLog;
-use app\v1\logic\gameLog\AnalyseLogic;
-use app\v1\logic\gameLog\MaterialLogic;
-use plugin\saiadmin\basic\BaseController;
-use plugin\saiadmin\basic\BaseLogic;
-use support\Request;
-use support\Response;
-class MaterialController extends BaseController
-{
-  protected $baseLogic;
-  public function __construct()
-  {
-    $this->logic = new MaterialLogic();
-    $this->baseLogic = new BaseLogic();
-    parent::__construct();
-  }
-
-  // 渠道数据总览
-  public function getMaterialList(Request $request)
-  {
-    $where = $request->more([
-      ['game_id', ''],
-      ['reg_date', ''],
-      ['author_id',''],
-      ['media_id',''],
-      ['cost_type',''],
-      ['material_name',''],
-      ['material_id',''],
-      ['auth_id', ''],
-      ['group',''],
-    ]);
-    $result = $this->logic->getMaterialList($where);
-    $result['data'] = $this->baseLogic->trandformListColumn($result['data'],['auth','author']);
-    return $this->success($result);
-  }
-}

app/v1/logic/gameLog/AnalyseLogic.php → app/v1/logic/dataReport/AnalyseLogic.php

@@ -2,7 +2,7 @@
 
 // 玩家日志逻
 
-namespace app\v1\logic\gameLog;
+namespace app\v1\logic\dataReport;
 
 use app\v1\logic\tool\ToolLogic;
 use plugin\saiadmin\basic\BaseLogic;

app/v1/logic/gameLog/ChannelAnalysisLogic.php → app/v1/logic/dataReport/ChannelAnalysisLogic.php

@@ -2,7 +2,7 @@
 
 // 玩家日志逻
 
-namespace app\v1\logic\gameLog;
+namespace app\v1\logic\dataReport;
 
 use app\v1\logic\tool\ToolLogic;
 use plugin\saiadmin\basic\BaseLogic;

app/v1/logic/gameLog/MaterialLogic.php → app/v1/logic/dataReport/MaterialLogic.php

@@ -2,7 +2,7 @@
 
 // 素材数据总览
 
-namespace app\v1\logic\gameLog;
+namespace app\v1\logic\dataReport;
 
 use app\v1\logic\tool\ToolLogic;
 use plugin\saiadmin\basic\BaseLogic;

app/v1/logic/gameLog/UserLogLogic.php → app/v1/logic/dataReport/UserLogLogic.php

@@ -2,7 +2,7 @@
 
 // 玩家日志逻
 
-namespace app\v1\logic\gameLog;
+namespace app\v1\logic\dataReport;
 
 use plugin\saiadmin\basic\BaseLogic;
 use plugin\saiadmin\service\OpenSpoutWriter;