Merge branch 'feature/game_select_bug' of wmtx/platform into master

游戏统计修改bug

Application/Admin/Controller/FinanceController.class.php

@@ -1004,6 +1004,10 @@ class FinanceController extends ThinkController
         if (!empty(I("game_id"))) {
             $map['game_id'] = I("game_id");
         }
+        if(empty(I("game_id")) && !empty(I("game_name"))){
+            $map['game_name'] = array('like','%'.I("game_name").'%');;
+        }
+
         if (!empty(I('user_account'))) {
             $map['user_account'] = array('like','%'.I("user_account").'%');
         }
@@ -1071,7 +1075,10 @@ class FinanceController extends ThinkController
             $totalMap['s.game_id'] = $map['game_id'];
             unset($totalMap['game_id']);
         }
-
+        if ($map['game_name']) {
+            $totalMap['s.game_name'] = $map['game_name'];
+            unset($totalMap['game_name']);
+        }
         $totalData = D('spend')->totalGameStatistics($totalMap, false);
 
         $sumCash = $totalData['cash_count'] ?? 0;