|
|
|
@ -34,6 +34,8 @@ class ActivityService implements ActivityServiceInterface |
|
|
|
->orWhereJsonLength("market_ids", '=', 0); |
|
|
|
}); |
|
|
|
|
|
|
|
return $builder->orderBy('sort', 'DESC')->get()->toArray(); |
|
|
|
return $builder->orderBy('sort', 'DESC') |
|
|
|
->orderBy('expire_time', 'ASC') |
|
|
|
->get()->toArray(); |
|
|
|
} |
|
|
|
} |