代码优化

app/v1/logic/dataReport/UserLogLogic.php

@@ -21,47 +21,23 @@ class UserLogLogic extends BaseLogic
         $params['reg_time'] = strtotime($regTime . " 00:00:00") . "<=" . strtotime($regTime . " 23:59:59");
         $limit = request()->input('limit', 10);
 
-
         // 获取这一天的注册日志
         $regLogQuery = Db::connect('db_game_log')
             ->table($tableName)
             ->where('reg_time', '>=', strtotime($regTime . ' 00:00:00'))
             ->where('reg_time', '<=', strtotime($regTime . ' 23:59:59'));
 
-        // 添加其他查询条件
-        if (!empty($params['game_id'])) {
-            $regLogQuery = $regLogQuery->where('game_id', 'in', is_array($params['game_id']) ? implode(',', $params['game_id']) : $params['game_id']);
-        }
-        if (!empty($params['user_name'])) {
-            $regLogQuery = $regLogQuery->where('user_name', $params['user_name']);
-        }
-        if (!empty($params['media_id'])) {
-            $regLogQuery = $regLogQuery->where('media_id', $params['media_id']);
-        }
-        if (!empty($params['site_id'])) {
-            $regLogQuery = $regLogQuery->where('site_id', $params['site_id']);
-        }
-        
-        if (!empty($params['agent_id'])) {
-            $regLogQuery = $regLogQuery->where('agent_id', $params['agent_id']);
+        // 公共处理完的where
+        $where = $this->getCommonWhere($params);
+        if($where){
+            $regLogQuery = $regLogQuery->where($where);
         }
-        if (!empty($params['auth_id'])){
-            $regLogQuery = $regLogQuery->where('auth_id', 'in', is_array($params['auth_id']) ? implode(',', $params['auth_id']) : $params['auth_id']);
-        }
-        if (!empty($params['vt'])) {
-            $regLogQuery = $regLogQuery->where('vt', $params['vt']);
-        }
-
         // 自然量ID, auth_id=0为自然量
         $whereRaw = $this->nomalGameWhere($params['nomal_game_id']);
-        if($whereRaw){
-            $regLogQuery = $regLogQuery->whereRaw($whereRaw);
-        }
+        $regLogQuery = $regLogQuery->whereRaw($whereRaw);
 
         // 分页
-        $data = $regLogQuery->paginate($limit)->toArray();
-
-        return $data;
+        return $regLogQuery->paginate($limit)->toArray();
     }
 
     // 登录日志
@@ -76,54 +52,23 @@ class UserLogLogic extends BaseLogic
         $loginTime = $params['login_time'];
         $tableName = 'sdk_login_log_' . date('Ym', strtotime($loginTime));
 
-
         $loginLogQuery = Db::connect('db_game_log')
-            ->table($tableName)
-            ->where('login_time', '>=', strtotime($params['login_time'] . ' 00:00:00'))
-            ->where('login_time', '<=', strtotime($params['login_time'] . ' 23:59:59'));
+            ->table($tableName);
 
-        if (!empty($params['game_id'])) {
-            $loginLogQuery = $loginLogQuery->where('game_id', 'in', is_array($params['game_id']) ? implode(',', $params['game_id']) : $params['game_id']);
-        }
-        if (!empty($params['user_name'])) {
-            $loginLogQuery = $loginLogQuery->where('user_name', $params['user_name']);
-        }
-        if (!empty($params['media_id'])) {
-            $loginLogQuery = $loginLogQuery->where('media_id', $params['media_id']);
-        }
-        if (!empty($params['site_id'])) {
-            $loginLogQuery = $loginLogQuery->where('site_id', $params['site_id']);
-        }
-        if (!empty($params['auth_id'])) {
-            $loginLogQuery = $loginLogQuery->where('auth_id', 'in', is_array($params['auth_id']) ? implode(',', $params['auth_id']) : $params['auth_id']);
-        }
-        if (!empty($params['agent_id'])) {
-            $loginLogQuery = $loginLogQuery->where('agent_id', $params['agent_id']);
-        }
-        if (!empty($params['reg_time'])) {
-            $loginLogQuery = $loginLogQuery
-                ->where('reg_time', '>=', strtotime($params['reg_time'] . ' 00:00:00'))
-                ->where('reg_time', '<=', strtotime($params['reg_time'] . ' 23:59:59'));
-        }
-        if (!empty($params['login_time'])) {
-            $loginLogQuery = $loginLogQuery
-                ->where('login_time', '>=', strtotime($params['login_time'] . ' 00:00:00'))
-                ->where('login_time', '<=', strtotime($params['login_time'] . ' 23:59:59'));
+        // 公共处理完的where
+        $where = $this->getCommonWhere($params);
+        if($where){
+            $loginLogQuery = $loginLogQuery->where($where);
         }
 
         // 自然量ID, auth_id=0为自然量
         $whereRaw = $this->nomalGameWhere($params['nomal_game_id']);
-        if($whereRaw){
-            $loginLogQuery = $loginLogQuery->whereRaw($whereRaw);
-        }
+        $loginLogQuery = $loginLogQuery->whereRaw($whereRaw);
 
         // 执行查询并排序
         $loginLogQuery->order($orderBy, $orderType);
 
-
-
-        $data = $loginLogQuery->paginate($limit)->toArray();
-        return $data;
+        return $loginLogQuery->paginate($limit)->toArray();
     }
 
     // 充值明细
@@ -164,7 +109,6 @@ class UserLogLogic extends BaseLogic
         $writer = new OpenSpoutWriter($file_name);
         $writer->setWidth([15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15]);
         $writer->setHeader($header);
-        // $writer->setData($data, null);
         $writer->setData($data, null, $filter);
         $file_path = $writer->returnFile();
         return response()->download($file_path, urlencode($file_name));
@@ -184,47 +128,16 @@ class UserLogLogic extends BaseLogic
         $tableName = 'sdk_order_success';
 
         $rechargeDetailQuery = Db::connect('db_game_log')
-            ->table($tableName)
-            ->where('pay_date', '>=', $params['pay_date'][0] . ' 00:00:00')
-            ->where('pay_date', '<=', $params['pay_date'][1] . ' 23:59:59');
+            ->table($tableName);
 
-
-        if (!empty($params['game_id'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('game_id', 'in', is_array($params['game_id']) ? implode(',', $params['game_id']) : $params['game_id']);
-        }
-        if (!empty($params['user_name'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('user_name', $params['user_name']);
-        }
-        if (!empty($params['media_id'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('media_id', $params['media_id']);
-        }
-        if (!empty($params['auth_id'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('auth_id', 'in', is_array($params['auth_id']) ? implode(',', $params['auth_id']) : $params['auth_id']);
-        }
-        if (!empty($params['agent_id'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('agent_id', $params['agent_id']);
-        }
-        if (!empty($params['site_id'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('site_id', $params['site_id']);
-        }
-        if (!empty($params['server_id'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('server_id', $params['server_id']);
-        }
-        if (!empty($params['server_name'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery->where('server_name', $params['server_name']);
-        }
-        if (!empty($params['reg_date'])) {
-            $rechargeDetailQuery = $rechargeDetailQuery
-                ->where('reg_date', '>=', $params['reg_date'][0] . ' 00:00:00')
-                ->where('reg_date', '<=', $params['reg_date'][1] . ' 23:59:59');
+        $where = $this->getCommonWhere($params);
+        if($where){
+            $rechargeDetailQuery = $rechargeDetailQuery->where($where);
         }
 
-
         // 自然量ID, auth_id=0为自然量
         $whereRaw = $this->nomalGameWhere($params['nomal_game_id']);
-        if($whereRaw){
-            $rechargeDetailQuery = $rechargeDetailQuery->whereRaw($whereRaw);
-        }
+        $rechargeDetailQuery = $rechargeDetailQuery->whereRaw($whereRaw);
 
         $rechargeDetailQuery->order($orderBy, $orderType);
 
@@ -250,45 +163,16 @@ class UserLogLogic extends BaseLogic
         $tableName = 'sdk_order_success';
 
         $rechargeRankQuery = Db::connect('db_game_log')
-            ->table($tableName)
-            ->where('pay_date', '>=', $params['pay_date'][0] . ' 00:00:00')
-            ->where('pay_date', '<=', $params['pay_date'][1] . ' 23:59:59');
+            ->table($tableName);
 
-        if (!empty($params['game_id'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('game_id', 'in', is_array($params['game_id']) ? implode(',', $params['game_id']) : $params['game_id']);
-        }
-        if (!empty($params['user_name'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('user_name', $params['user_name']);
-        }
-        if (!empty($params['media_id'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('media_id', $params['media_id']);
-        }
-        if (!empty($params['auth_id'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('auth_id', 'in', is_array($params['auth_id']) ? implode(',', $params['auth_id']) : $params['auth_id']);
-        }
-        if (!empty($params['agent_id'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('agent_id', $params['agent_id']);
-        }
-        if (!empty($params['site_id'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('site_id', $params['site_id']);
-        }
-        if (!empty($params['server_id'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('server_id', $params['server_id']);
-        }
-        if (!empty($params['server_name'])) {
-            $rechargeRankQuery = $rechargeRankQuery->where('server_name', $params['server_name']);
-        }
-        if (!empty($params['reg_date'])) {
-            $rechargeRankQuery = $rechargeRankQuery
-                ->where('reg_date', '>=', $params['reg_date'][0] . ' 00:00:00')
-                ->where('reg_date', '<=', $params['reg_date'][1] . ' 23:59:59');
+        $where = $this->getCommonWhere($params);
+        if($where){
+            $rechargeRankQuery = $rechargeRankQuery->where($where);
         }
 
         // 自然量ID, auth_id=0为自然量
         $whereRaw = $this->nomalGameWhere($params['nomal_game_id']);
-        if($whereRaw){
-            $rechargeRankQuery = $rechargeRankQuery->whereRaw($whereRaw);
-        }
+        $rechargeRankQuery = $rechargeRankQuery->whereRaw($whereRaw);
 
         // 先选择字段，包括计算字段
         $rechargeRankQuery->field('user_name,sum(money) as searchTotalMoney,
@@ -316,8 +200,7 @@ class UserLogLogic extends BaseLogic
 
         $data['data'] = $this->trandformListColumn($data['data'], ['game', 'auth', 'agent', 'pay_channel']);
 
-        // // 告警提示，查询最近登录时间，查询最近充值时间，和现在时间对比，如果超过3天，则告警，并提示
-
+        // 告警提示，查询最近登录时间，查询最近充值时间，和现在时间对比，如果超过3天，则告警，并提示
         foreach ($data['data'] as &$item) {
             // 最后登录时间
             $item['login_time'] = Db::connect('db_origin')->table('user_' . $item['uid'] % 10)->where('uid', $item['uid'])->value('login_time');
@@ -327,57 +210,26 @@ class UserLogLogic extends BaseLogic
             $item['now_time'] = time();
 
             // 最近登录时间与现在时间对比，如果超过3天，则告警，并提示
-            if ($item['login_time'] < $item['now_time'] - 3 * 24 * 60 * 60) {
+            if ($item['login_time'] < $item['now_time'] - 3 * 86400) {
                 $item['login_alert'] = 1;
             } else {
                 $item['login_alert'] = 0;
             }
             // 最近充值时间与现在时间对比，如果超过3天，则告警，并提示
-            if ($item['pay_time'] < $item['now_time'] - 3 * 24 * 60 * 60) {
+            if ($item['pay_time'] < $item['now_time'] - 3 * 86400) {
                 $item['pay_alert'] = 1;
             } else {
                 $item['pay_alert'] = 0;
             }
         }
 
-
-        $totalWhere = [];
-        if (!empty($params['game_id'])) {
-            $totalWhere[] = ['game_id', 'in', is_array($params['game_id']) ? implode(',', $params['game_id']) : $params['game_id']];
-        }
-        if (!empty($where['auth_id'])) {
-            $totalWhere[] = ['auth_id', 'in', is_array($params['auth_id']) ? implode(',', $params['auth_id']) : $params['auth_id']];
-        }
-        if (!empty($where['agent_id'])) {
-            $totalWhere['agent_id'] = $params['agent_id'];
-        }
-        if (!empty($where['site_id'])) {
-            $totalWhere['site_id'] = $params['site_id'];
-        }
-        if (!empty($where['server_id'])) {
-            $totalWhere['server_id'] = $params['server_id'];
-        }
-        if (!empty($where['user_name'])) {
-            $totalWhere['user_name'] = $params['user_name'];
-        }
-        if (!empty($where['server_name'])) {
-            $totalWhere['server_name'] = $params['server_name'];
-        }
-        if (!empty($where['reg_date'])) {
-            $totalWhere['reg_date'] = $params['reg_date'];
-        }
-
-        // 自然量ID, auth_id=0为自然量
-        $whereRaw = $this->nomalGameWhere($params['nomal_game_id']);
-
         $totalList = Db::connect('db_game_log')->table('sdk_order_success')
-            ->where($totalWhere)
+            ->where($where)
             ->whereRaw($whereRaw)
             ->field('game_id,uid,sum(money) as totalMoney')
             ->group('uid,game_id,site_id,server_id,media_id,auth_id,agent_id,server_id,auth_id,role_id')
             ->select()->toArray();
 
-
         // 查询累计充值金额（对每一行数据单独查询历史充值金额）
         $totalMoneyMap = [];
         if (!empty($data['data']) && !empty($totalList)) {
@@ -406,35 +258,24 @@ class UserLogLogic extends BaseLogic
         $params = $this->searchByAuth($where);
         $regTime = $params['reg_time'];
 
-
         $egTableName = 'sdk_reg_log_' . date('Ym', strtotime($regTime));
 
-
         $userData = Db::connect('db_game_log')->table($egTableName)->where('reg_time', '>=', strtotime($regTime . ' 00:00:00'))->where('reg_time', '<=', strtotime($regTime . ' 23:59:59'))->select()->toArray();
 
         $where_sql = $this->generateWhereSql($params);
-        
-
 
         $uids = array_column($userData, 'uid');
 
-        if (empty($userData)) {
-            return [];
-        }
+        if (empty($userData)) return [];
 
         $where_sql = " AND uid in (" . implode(',', $uids) . ") {$where_sql}";
 
-
-      
         $sql_parts = [];
         $sql_parts[] = "SELECT * FROM role_data_and WHERE 1=1 {$where_sql}";
         $sql_parts[] = "SELECT * FROM role_data_ios WHERE 1=1 {$where_sql}";
-
-
         $unionSql = implode(" UNION ALL ", $sql_parts);
 
         // 分页
-
         $offset = ($page - 1) * $limit;
         $unionSql .= " LIMIT {$offset}, {$limit}";
         $roleData = Db::connect('db_game_log')->query($unionSql);
@@ -471,7 +312,5 @@ class UserLogLogic extends BaseLogic
             'has_more' => $page < ceil($count / $limit),
             'total' => $count
         ];
-
     }
-
 }

plugin/saiadmin/basic/BaseLogic.php

@@ -282,7 +282,29 @@ class BaseLogic
         }
         return $whereRaw ? implode(' OR ', $whereRaw) : "1=1";
     }
-    
+
+    protected function getCommonWhere($params)
+    {
+        $eqParams = ["user_name", "media_id", "site_id", "agent_id", "vt", "server_id", "server_name"];
+        $inParams = ["game_id", "auth_id"];
+        $betweenParams = ["reg_time", "login_time", "pay_date", "reg_date"];
+
+        $where = [];
+        foreach ($params as $key => $value){
+            if (in_array($key, $eqParams)) {
+                $where[$key] = $value;
+            } elseif (in_array($key, $inParams)) {
+                $where[$key] = is_string($value) ? explode(',', $value) : $value;
+            } elseif (in_array($key, $betweenParams)) {
+                if (!empty($value)) {
+                    $where[] = [$key, 'between', [$value[0] .' 00:00:00', $value[1] .' 23:59:59']];
+                }
+            }
+
+        }
+
+        return $where;
+    }
     /**
      * 分页查询数据
      * @param $query