|
|
@@ -187,7 +187,7 @@ class LiveService extends BaseService
|
|
|
$info['view_limit'] = 0;
|
|
|
|
|
|
// 浏览历史
|
|
|
- if(!VideoCollectService::make()->getCollectCacheInfo($userId, $id, 1)){
|
|
|
+ if(!VideoCollectService::make()->getCollectCacheInfo($userId, $id, 1, 2)){
|
|
|
$data = [
|
|
|
'user_id'=> $userId,
|
|
|
'type'=> 1,
|
|
|
@@ -253,7 +253,7 @@ class LiveService extends BaseService
|
|
|
->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');
|
|
|
+ $total = $countModel->groupBy('a.id')->count('a.id');
|
|
|
|
|
|
$datas = $model->groupBy('a.id')
|
|
|
->orderBy('b.reward_total','desc')
|