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

修改推广员统计BUG
master
廖金灵 4 years ago committed by Gogs
commit 93ca6240be

@ -473,7 +473,7 @@ class PlatformController extends ThinkController
$play_info_map = false; $play_info_map = false;
if (isset($_REQUEST['server_id'])) { if (isset($_REQUEST['server_id'])) {
$play_map = false; //有区服就不检索玩家表,有区服一定已经选择游戏了 $play_map = false; //有区服就不检索玩家表,有区服一定已经选择游戏了
$play_info_map = " and upi.server_id = '{$_REQUEST['server_id']}' and upi.game_name = '{$_REQUEST['game_name']}'"; $play_info_map = " and upi.server_id = '{$_REQUEST['server_id']}' and upi.game_name like '{$_REQUEST['game_name']}%'";
} }
if (!empty($_REQUEST['admin_id'])) { if (!empty($_REQUEST['admin_id'])) {
@ -515,7 +515,7 @@ class PlatformController extends ThinkController
substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id") substring_index(substring_index(promote.`chain`,'/',2),'/',-1)),0) id")
->join("tab_promote promote ON u.promote_id = promote.id","left") ->join("tab_promote promote ON u.promote_id = promote.id","left")
->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false) ->join($play_map ? "tab_user_play as up on up.user_id = u.id " . $play_map : false)
// ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->join('tab_game on u.fgame_id = tab_game.id') ->join('tab_game on u.fgame_id = tab_game.id')
->where($map) ->where($map)
->group('tab_game.relation_game_id, id') ->group('tab_game.relation_game_id, id')

Loading…
Cancel
Save