|
|
|
@ -1678,16 +1678,8 @@ class QueryController extends BaseController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($relationGameId != 0 || $sdkVersion != 0) {
|
|
|
|
|
if ($relationGameId != 0) {
|
|
|
|
|
$gameMap['relation_game_id'] = $relationGameId;
|
|
|
|
|
}
|
|
|
|
|
if ($sdkVersion != 0) {
|
|
|
|
|
$gameMap['sdk_version'] = $sdkVersion;
|
|
|
|
|
}
|
|
|
|
|
$gameId = M('game', 'tab_')->where($gameMap)->getField('id', true);
|
|
|
|
|
$gameId = $gameId ?? [];
|
|
|
|
|
|
|
|
|
|
$map['game_id'] = ['in', $gameId];
|
|
|
|
|
$gameIds = gameSearch($relationGameId, $sdkVersion);
|
|
|
|
|
$map['game_id'] = ['in', $gameIds];
|
|
|
|
|
}
|
|
|
|
|
if ($serverId != 0) {
|
|
|
|
|
$map['server_id'] = $serverId;
|
|
|
|
@ -1793,17 +1785,9 @@ class QueryController extends BaseController
|
|
|
|
|
$subMap = ['promote_id' => ['in', $ids]];
|
|
|
|
|
|
|
|
|
|
if ($relationGameId != 0 || $sdkVersion != 0) {
|
|
|
|
|
if ($relationGameId != 0) {
|
|
|
|
|
$gameMap['relation_game_id'] = $relationGameId;
|
|
|
|
|
}
|
|
|
|
|
if ($sdkVersion != 0) {
|
|
|
|
|
$gameMap['sdk_version'] = $sdkVersion;
|
|
|
|
|
}
|
|
|
|
|
$gameId = M('game', 'tab_')->where($gameMap)->getField('id', true);
|
|
|
|
|
$gameId = $gameId ?? [];
|
|
|
|
|
|
|
|
|
|
$map['uc.game_id'] = ['in', $gameId];
|
|
|
|
|
$subMap['game_id'] = ['in', $gameId];
|
|
|
|
|
$gameIds = gameSearch($relationGameId, $sdkVersion);
|
|
|
|
|
$map['uc.game_id'] = ['in', $gameIds];
|
|
|
|
|
$subMap['game_id'] = ['in', $gameIds];
|
|
|
|
|
}
|
|
|
|
|
if ($serverId != 0) {
|
|
|
|
|
$map['uc.server_id'] = $serverId;
|
|
|
|
@ -2081,16 +2065,8 @@ class QueryController extends BaseController
|
|
|
|
|
'basicPromotes' => $basicPromotes,
|
|
|
|
|
];
|
|
|
|
|
if ($relationGameId != 0 || $sdkVersion != 0) {
|
|
|
|
|
if ($relationGameId != 0) {
|
|
|
|
|
$gameMap['relation_game_id'] = $relationGameId;
|
|
|
|
|
}
|
|
|
|
|
if ($sdkVersion != 0) {
|
|
|
|
|
$gameMap['sdk_version'] = $sdkVersion;
|
|
|
|
|
}
|
|
|
|
|
$gameId = M('game', 'tab_')->where($gameMap)->getField('id', true);
|
|
|
|
|
$gameId = $gameId ?? [];
|
|
|
|
|
|
|
|
|
|
$params['game_id'] = ['in', $gameId];
|
|
|
|
|
$gameIds = gameSearch($relationGameId, $sdkVersion);
|
|
|
|
|
$params['game_id'] = ['in', $gameIds];
|
|
|
|
|
}
|
|
|
|
|
if ($serverId > 0) {
|
|
|
|
|
$params['server_id'] = $serverId;
|
|
|
|
|