diff --git a/Application/Base/Repository/SpendRepository.class.php b/Application/Base/Repository/SpendRepository.class.php
index fa0260cd5..79668d255 100644
--- a/Application/Base/Repository/SpendRepository.class.php
+++ b/Application/Base/Repository/SpendRepository.class.php
@@ -34,14 +34,14 @@ class SpendRepository
         $gameIds = $params['game_ids'] ?? [];
 
         $conditions = [];
-        $conditions['pay_status'] = 1;
         $conditions['promote_id'] = ['in', $ids];
-        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];
         $conditions['game_id'] = ['in', $gameIds];
-        $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1'];
         if (!empty($params['server_id'])) {
             $conditions['server_id'] = $params['server_id'];
         }
+        $conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1'];
+        $conditions['pay_status'] = 1;
+        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];
 
         return $conditions;
     }
@@ -56,7 +56,6 @@ class SpendRepository
         $conditions = [];
         $conditions['pay_status'] = 1;
         $conditions['promote_id'] = ['in', $ids];
-        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];
         $conditions['game_id'] = ['in', $gameIds];
         if (!empty($params['server_id'])) {
             $conditions['server_id'] = $params['server_id'];
@@ -64,6 +63,7 @@ class SpendRepository
         if (isset($params['pay_way'])) {
             $conditions['pay_way'] = $params['pay_way'];
         }
+        $conditions['pay_time'] = ['between', [$beginTime, $endTime]];
 
         return $conditions;
     }
diff --git a/Application/Base/Repository/UserRepository.class.php b/Application/Base/Repository/UserRepository.class.php
index 87422ee91..b1efad03b 100644
--- a/Application/Base/Repository/UserRepository.class.php
+++ b/Application/Base/Repository/UserRepository.class.php
@@ -65,13 +65,13 @@ class UserRepository
 
         $conditions = [];
         $conditions['promote_id'] = ['in', $ids];
-        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
         if (!empty($gameIds)) {
             $conditions['game_id'] = ['in', $gameIds];
             if (!empty($params['server_id'])) {
                 $conditions['server_id'] = $params['server_id'];
             }
         }
+        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
 
         return $conditions;
     }
@@ -107,11 +107,11 @@ class UserRepository
 
         $conditions = [];
         $conditions['promote_id'] = ['in', $ids];
-        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
         $conditions['game_id'] = ['in', $gameIds];
         if ($serverId > 0) {
             $conditions['server_id'] = $serverId;
         }
+        $conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
 
         return $conditions;
     }
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index e81dd059c..198742df2 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1316,10 +1316,7 @@ class QueryController extends BaseController
         $allData['spend_voucher'] = 0;
         if (!empty($data)) {
             if (intval($endTime - $begTime) / (24 * 3600) <= 31) {
-                $gameIds = [];
-                foreach ($data as $list) {
-                    $gameIds[] = $list['game_id'];
-                }
+                $gameIds = array_column($data, 'game_id');
                 $params['game_ids'] = $gameIds;
 
                 $userRepository = new UserRepository();