Merge commit 'd40fef8045528694463cc33b96e3b4bc83a810c0' into dev

app/process/advert/GdtCostHour.php → app/process/advertCost/GdtCostHour.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\process\advert;
+namespace app\process\advertCost;
 use Workerman\Crontab\Crontab;
 use app\v1\logic\tool\advertCost\GdtCostHourLogic;
 

app/process/advert/GdtCostVideo.php → app/process/advertCost/GdtCostVideo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\process\advert;
+namespace app\process\advertCost;
 use Workerman\Crontab\Crontab;
 use app\v1\logic\tool\advertCost\GdtCostVideoLogic;
 

app/process/advert/TtCostHour.php → app/process/advertCost/TtCostHour.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\process\advert;
+namespace app\process\advertCost;
 use Workerman\Crontab\Crontab;
 use app\v1\logic\tool\advertCost\TtCostHourLogic;
 

app/process/advert/TtCostVideo.php → app/process/advertCost/TtCostVideo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\process\advert;
+namespace app\process\advertCost;
 use Workerman\Crontab\Crontab;
 use app\v1\logic\tool\advertCost\TtCostVideoLogic;
 

app/v1/logic/tool/advertCost/GdtCostVideoLogic.php

@@ -157,7 +157,7 @@ class GdtCostVideoLogic extends BaseAdvertLogic
                 'material_img' => $materialImg,
                 'ori_money' => $cost,
                 'money' => $cost*$fandianRate,
-                'show' => $val['view_count'],
+                'ad_show' => $val['view_count'],
                 'click' => $val['valid_click_count'],
                 'total_play' => $val['video_outer_play_count'],
                 'valid_play' => $val['video_outer_play100_count'],

app/v1/logic/tool/advertCost/TtCostVideoLogic.php

@@ -174,7 +174,7 @@ class TtCostVideoLogic extends BaseAdvertLogic
                 'material_img' => $materialImg,
                 'ori_money' => $cost,
                 'money' => $cost*$fandianRate,
-                'show' => $val['metrics']['show_cnt'],
+                'ad_show' => $val['metrics']['show_cnt'],
                 'click' => $val['metrics']['click_cnt'],
                 'total_play' => $val['metrics']['total_play'],
                 'valid_play' => $val['metrics']['valid_play'],

config/process.php

@@ -76,10 +76,10 @@ return [
     ],
     // gdt 获取广告消耗
     'gdt_cost' =>  [
-        'handler' => \app\process\advert\GdtCostHour::class,
+        'handler' => \app\process\advertCost\GdtCostHour::class,
     ],
     // gdt 获取广告消耗
     'tt_cost' =>  [
-        'handler' => \app\process\advert\TtCostHour::class,
+        'handler' => \app\process\advertCost\TtCostHour::class,
     ],
 ];