|
|
|
@ -1247,9 +1247,10 @@ class PromoteService {
|
|
|
|
|
$map = [];
|
|
|
|
|
$map['_string'] = ' promote_id in(' . $this->subInSql($topPromote) . ')';
|
|
|
|
|
$map = $spendRepository->withIsCheck($map);
|
|
|
|
|
$historyGameIds = M('spend', 'tab_')->field(['distinct game_id'])->where($map)->getField('game_id', true);
|
|
|
|
|
if (!$historyGameIds) {
|
|
|
|
|
$historyGameIds = [];
|
|
|
|
|
$historyGames = M('spend', 'tab_')->field(['distinct game_id'])->where($map)->select();
|
|
|
|
|
$historyGameIds = [];
|
|
|
|
|
if ($historyGames) {
|
|
|
|
|
$historyGameIds = array_column($historyGames, 'game_id');
|
|
|
|
|
}
|
|
|
|
|
$nowGameIds = $topPromote['game_ids'] == '' ? [] : explode(',', $topPromote['game_ids']);
|
|
|
|
|
return array_unique(array_merge($historyGameIds, $nowGameIds));
|
|
|
|
|