Merge branch 'feature/testing_resource_admin' of wmtx/platform into release

测试资源功能优化

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);

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 . ')';