aiden 2 сар өмнө
parent
commit
1b5941580d

+ 9 - 5
app/model/MerchantStatisModel.php

@@ -40,11 +40,8 @@ class MerchantStatisModel extends Model
             $endTime = strtotime($filters['end_time']. " +1 day");
             $endTime = strtotime($filters['end_time']. " +1 day");
             $where[] = ['create_time', '<=', $endTime];
             $where[] = ['create_time', '<=', $endTime];
         }
         }
-        $query = self::where($where);
-        // 统计总数
-        $total = $query->count();
         // 获取列表数据
         // 获取列表数据
-        $list = $query->field([
+        $subQuery = self::field([
                     "FROM_UNIXTIME(create_time, '%Y-%m-%d') as date", // 日期
                     "FROM_UNIXTIME(create_time, '%Y-%m-%d') as date", // 日期
                     'COUNT(DISTINCT uname) as bet_users',  // 投注用户数
                     'COUNT(DISTINCT uname) as bet_users',  // 投注用户数
                     'COUNT(id) as bet_count',  // 注单数
                     'COUNT(id) as bet_count',  // 注单数
@@ -54,11 +51,18 @@ class MerchantStatisModel extends Model
                     'COUNT(DISTINCT game_id) as game_count',  // 游戏数量
                     'COUNT(DISTINCT game_id) as game_count',  // 游戏数量
                     'SUM(is_buy_game) as buy_free_bet_count'
                     'SUM(is_buy_game) as buy_free_bet_count'
         ])
         ])
-            ->order('date', 'desc')
+            ->where($where)
             ->group('date')
             ->group('date')
+            ->buildSql();
+
+        // 统计总数
+        $total = self::table($subQuery . ' t')->count();
+        $list = self::table($subQuery . ' t')
+            ->order('date', 'desc')
             ->page($page, $limit)
             ->page($page, $limit)
             ->select()
             ->select()
             ->toArray();
             ->toArray();
+
         // 获取登录用户、注册用户    
         // 获取登录用户、注册用户    
         $merchantsUserStatic = MerchantsUserModel::getPlayerStatistics($merchantId, $filters);
         $merchantsUserStatic = MerchantsUserModel::getPlayerStatistics($merchantId, $filters);