|
|
@@ -249,15 +249,15 @@ class LiveService extends BaseService
|
|
|
})
|
|
|
->where(['a.status'=>1,'a.mark'=>1])
|
|
|
->where('b.id','>', 0)
|
|
|
- ->select(['a.id','a.nickname','a.avatar','a.member_level','a.gender','a.intro','a.status','b.create_time','b.reward_total','b.collect_id as live_id'])
|
|
|
- ->groupBy('a.id')
|
|
|
- ->orderBy('b.reward_total','desc')
|
|
|
- ->orderBy('b.create_time','desc');
|
|
|
+ ->select(['a.id','a.nickname','a.avatar','a.member_level','a.gender','a.intro','a.status','b.create_time','b.reward_total','b.collect_id as live_id']);
|
|
|
|
|
|
$countModel = clone $model;
|
|
|
$total = $countModel->count('a.id');
|
|
|
|
|
|
- $datas = $model->limit($rankNum)->get();
|
|
|
+ $datas = $model->groupBy('a.id')
|
|
|
+ ->orderBy('b.reward_total','desc')
|
|
|
+ ->orderBy('b.create_time','desc')
|
|
|
+ ->limit($rankNum)->get();
|
|
|
$datas = $datas? $datas->toArray() : [];
|
|
|
$rankData = ['user_id'=> $userId,'rank'=>0,'reward_total'=>0];
|
|
|
if ($datas) {
|
