1

app/v1/logic/dataReport/AnalyseLogic.php

@@ -1,17 +1,14 @@
 <?php
 
 // 运营分析
-
 namespace app\v1\logic\dataReport;
 
-
 use plugin\saiadmin\basic\BaseLogic;
 use plugin\saiadmin\exception\ApiException;
 use support\think\Db;
 
 class AnalyseLogic extends BaseLogic
 {
-
     // 注册按日
     public function getRegDayDataList($params)
     {
@@ -33,7 +30,7 @@ class AnalyseLogic extends BaseLogic
 
         $totalRow = ['game_id' => '合计'];
         foreach ($list as $row) {
-            $totalRow['total'] = !empty($totalRow['total']) ? $totalRow['total'] + $row['total'] : $row['total'];
+            $totalRow['total'] = !empty($totalRow['total']) ? ($totalRow['total'] + $row['total']) : $row['total'];
             foreach ($row as $key => $value) {
                 if ($key == 'total' || $key == 'game_id') {
                     continue;
@@ -76,29 +73,6 @@ class AnalyseLogic extends BaseLogic
         return $result;
     }
 
-
-    // 留存按日
-    public function generateYearUnionList($namePrefix, $regDate, $whereRaw = '1=1', $field = '*', $group = null)
-    {
-        $yearRange = getYearRange($regDate[0], $regDate[1]);
-        $sqlParts = [];
-        foreach ($yearRange as $year) {
-            $tableName = $namePrefix . $year;
-            $sqlParts[] = "SELECT * FROM {$tableName} WHERE {$whereRaw}";
-        }
-        $unionSql = implode(" UNION ALL ", $sqlParts);
-        $finalSql = "
-            SELECT {$field} FROM ( {$unionSql} ) AS all_total_day
-        ";
-        if (!empty($group)) {
-            $finalSql .= " GROUP BY {$group}";
-        }
-
-        $baseData = Db::connect('db_data_report')->query($finalSql);
-        return $baseData;
-    }
-
-
     /*
      数据总览
     */
@@ -466,7 +440,6 @@ class AnalyseLogic extends BaseLogic
             'game_id' => '合计',
         ];
 
-
         $allTotal = 0;
         $data = [];
         foreach ($baseData as &$row) {
@@ -558,8 +531,6 @@ class AnalyseLogic extends BaseLogic
         ");
         $payDataMap = array_column($payData, null, 'dimension');
 
-
-     
         // 2. 计算留存付费的人数
         $sqlArr = [];
         $medate = date("Y-m-d", strtotime("+ 60 day", strtotime($params['reg_date'][1])));

app/v1/logic/dataReport/ChannelAnalysisLogic.php

@@ -450,26 +450,6 @@ class ChannelAnalysisLogic extends BaseLogic
         ];
     }
 
-    public function generateYearUnionList($namePrefix, $regDate, $whereSql = '', $field = '*', $group = null)
-    {
-
-        $yearRange = getYearRange($regDate[0], $regDate[1]);
-        $sqlParts = [];
-        foreach ($yearRange as $year) {
-            $tableName = $namePrefix . $year;
-            $sqlParts[] = "SELECT * FROM {$tableName} WHERE 1=1 {$whereSql}";
-        }
-        $unionSql = implode(" UNION ALL ", $sqlParts);
-        $finalSql = "
-            SELECT {$field} FROM ( {$unionSql} ) AS all_total_day
-        ";
-        if (!empty($group)) {
-            $finalSql .= " GROUP BY {$group}";
-        }
-        $baseData = Db::connect('db_data_report')->query($finalSql);
-        return $baseData;
-    }
-
     /**
      * @param $where
      * @param $group

plugin/saiadmin/basic/BaseLogic.php

@@ -432,4 +432,22 @@ class BaseLogic
 
         return $whereRaw . ($whereOr ? " OR {$whereOr}" : "");
     }
+
+    public function generateYearUnionList($namePrefix, $regDate, $whereRaw = '1=1', $field = '*', $group = null)
+    {
+        $yearRange = getYearRange($regDate[0], $regDate[1]);
+        $sqlParts = [];
+        foreach ($yearRange as $year) {
+            $tableName = $namePrefix . $year;
+            $sqlParts[] = "SELECT * FROM {$tableName} WHERE {$whereRaw}";
+        }
+        $unionSql = implode(" UNION ALL ", $sqlParts);
+        $finalSql = " SELECT {$field} FROM ( {$unionSql} ) AS all_total_day ";
+        if (!empty($group)) {
+            $finalSql .= " GROUP BY {$group}";
+        }
+
+        $baseData = \support\think\Db::connect('db_data_report')->query($finalSql);
+        return $baseData;
+    }
 }