From ceb50f20b641bca81e8b55021fe962d9445c108e Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Tue, 26 Nov 2019 20:58:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MemberController.class.php     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 7d0a4cb7e..0d6029bf6 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -123,13 +123,14 @@ class MemberController extends ThinkController
             unset($_REQUEST['status']);
         }
 
+        $game_map = "";
 
-        // if (isset($_REQUEST['game_name'])) {
-        //     //$game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
-        // }
-        $spendprom = " and ss.game_id in (".implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')).")";
+        if (isset($_REQUEST['game_name'])) {
+            $game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+        }
+        $game_play_map = '';
         if (isset($_REQUEST['server_name'])) {
-            $map['server_name'] = ['like', "{$_REQUEST['server_name']}%"];
+            $game_play_map .= " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' ";
         }
 
         if (isset($_REQUEST['viplevel'])) {
@@ -188,6 +189,8 @@ class MemberController extends ThinkController
         if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
             $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
             ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1'.$spendprom)
+            ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
+            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
             ->page($page, $row)
             ->having($havs)
             ->group('a.id')
@@ -197,6 +200,8 @@ class MemberController extends ThinkController
         }else{
             $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
             ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1')
+            ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
+            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
             ->page($page, $row)
             ->having($havs)
             ->group('a.id')
@@ -207,7 +212,9 @@ class MemberController extends ThinkController
 
         //计数
         $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
-            ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom)
+            ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1')
+            ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
+            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
             ->where($map)
             ->group('tab_user.id')
             ->where($hav)
@@ -222,6 +229,8 @@ class MemberController extends ThinkController
         if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
             $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
             ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom)
+            ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
+            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
             ->where($map)
             ->group('tab_user.id')
             ->where($hav)