ith5 преди 5 месеца
родител
ревизия
cb9275a166
променени са 2 файла, в които са добавени 22 реда и са изтрити 3 реда
  1. 18 1
      app/v1/controller/customer/ReconciliationController.php
  2. 4 2
      app/v1/logic/gameLog/ChannelAnalysisLogic.php

+ 18 - 1
app/v1/controller/customer/ReconciliationController.php

@@ -6,6 +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 support\Request;
 use support\Response;
 
@@ -28,5 +29,21 @@ class ReconciliationController extends BaseController
     return $this->success($result);
   }
 
-  // 充值渠道支出
+  // 渠道汇总(财务)
+  public function getChannelSummary(Request $request)
+  {
+    $where = $request->more([
+        ['game_id', ''],
+        ['media_id', ''],
+        ['agent_id', ''],
+        ['site_id', ''],
+        ['auth_id', ''],
+        ['reg_date', ''],
+        ['group', ''],
+        ['filter', '']
+    ]);
+    $logic = new channelAnalysisLogic();
+    $result = $logic->getAgentDataList($where);
+    return $this->success($result);
+  }
 }

+ 4 - 2
app/v1/logic/gameLog/ChannelAnalysisLogic.php

@@ -368,6 +368,7 @@ class channelAnalysisLogic extends BaseLogic
         $mediaData = array_column($mediaData, null, 'id');
 
 
+        print_r($baseData);
         // 拼接数据
         foreach($baseData as $key => &$row){
 
@@ -408,12 +409,13 @@ class channelAnalysisLogic extends BaseLogic
             // 累计回本率
             $row['re_per']  = (float)trim(ToolLogic::getPercent($row['reg_pay_total'],$row['cost']), "%");
 
+     
+            $row['reg_pay_amount']= $hb7dayData[$typeId]['reg_pay_amount'] ?? 0;
+
             // 实际回本率
             $row['re_amount_per'] = ToolLogic::getPercent($row['reg_pay_amount'],$row['cost'],1);
 
 
-            $row['reg_pay_amount']= $hb7dayData[$typeId]['reg_pay_amount'] ?? 0;
-
             //ARPU
             $row['arpu']    = ToolLogic::getRound($row['reg_pay_total'],$row['reg_pay_num']);