|
|
|
@ -297,8 +297,8 @@ class SpendRepository
|
|
|
|
|
$oldConditions['pay_time'] = ['lt', $beginTime];
|
|
|
|
|
$oldQuery = M('spend', 'tab_')->field('user_id')->where($oldConditions)->group('user_id')->buildSql();
|
|
|
|
|
$conditions['user_id'] = ['exp', ' not in (' . $oldQuery . ')'];
|
|
|
|
|
$items = M('spend', 'tab_')->field('count(distinct user_id) count, game_id')->where($conditions)->group('game_id')->find();
|
|
|
|
|
return $this->assembleRecords($items, $gameIds, 'amount', 'game_id');
|
|
|
|
|
$items = M('spend', 'tab_')->field('count(distinct user_id) count, game_id')->where($conditions)->group('game_id')->select();
|
|
|
|
|
return $this->assembleRecords($items, $gameIds, 'count', 'game_id');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|