Merge branch 'hotfix/test_resource_new' of wmtx/platform into master

修改BUG

Application/Home/Controller/TestingResourceController.class.php

@@ -167,7 +167,7 @@ class TestingResourceController extends BaseController
                 'pay_status' => 1,
                 '_string' => '(' . implode(' or ', $spendOrWhere) . ')',
             ];
-            $spendList = M('spend', 'tab_')->field('sum(pay_amount) amount, game_id, game_player_id')->where($spendOrWhere)->group('game_id,game_player_id')->select();
+            $spendList = M('spend', 'tab_')->field('sum(pay_amount) amount, game_id, game_player_id')->where($spendCondition)->group('game_id,game_player_id')->select();
             foreach ($spendList as $item) {
                 $spendItems[$this->getGameRoleId($item['game_id'], $item['game_player_id'])] = $item['amount'];
             }