From 5253a76963389c9943a5b4026a2eca1370b96c2b Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 12 Nov 2020 13:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ConsoleController.class.php      | 4 ++--
 .../Base/Repository/TestingResourceRepository.class.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php
index 85aaf0a88..6839b3496 100644
--- a/Application/Admin/Controller/ConsoleController.class.php
+++ b/Application/Admin/Controller/ConsoleController.class.php
@@ -616,7 +616,7 @@ class ConsoleController extends Think {
                 $hasNext = false;
             }
             $userIds = array_column($testingUsers, 'user_id');
-            $users = M('user', 'tab_')->field(['id', 'login_time'])->where(['id' => ['in', $userIds]])->select();
+            $users = M('user', 'tab_')->field(['id', 'account', 'login_time'])->where(['id' => ['in', $userIds]])->select();
             $users = index_by_column('id', $users);
             $unloginLimitTime = 7 * 24 * 3600;
             $unloginUserIds = [];
@@ -629,7 +629,7 @@ class ConsoleController extends Think {
             }
             if (count($unloginUserIds) > 0) {
                 M('testing_user', 'tab_')->where(['user_id' => ['in', $unloginUserIds]])->save([
-                    'status' => 2
+                    'status' => 3
                 ]);
             }
         } while($hasNext);
diff --git a/Application/Base/Repository/TestingResourceRepository.class.php b/Application/Base/Repository/TestingResourceRepository.class.php
index 81a001291..ad62b42b0 100644
--- a/Application/Base/Repository/TestingResourceRepository.class.php
+++ b/Application/Base/Repository/TestingResourceRepository.class.php
@@ -305,7 +305,7 @@ class TestingResourceRepository
                     '_string' => 
                         'tab_testing_binding.bind_role_id = tab_spend.game_player_id and ' . 
                         'tab_testing_binding.game_id = tab_spend.game_id and ' . 
-                        'UNIX_TIMESTAMP(FROM_UNIXTIME(tab_testing_binding.create_time, "%Y-%m-%d 00:00:00"))  < tab_spend.pay_time'
+                        'UNIX_TIMESTAMP(FROM_UNIXTIME(tab_testing_binding.create_time, "%Y-%m-%d 00:00:00"))  <= tab_spend.pay_time'
                 ])
                 ->select(false);
             $spendCondition['_string'] .= ' and exists(' . $subBindingSql . ')';