From 4458ecd60f5d91b3741d2278481c8fd71e539cf7 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 14 Sep 2020 11:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/ActivityService.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Service/v3/Implementations/ActivityService.php b/app/Service/v3/Implementations/ActivityService.php index 381d737..e5ed0bf 100644 --- a/app/Service/v3/Implementations/ActivityService.php +++ b/app/Service/v3/Implementations/ActivityService.php @@ -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(); } } \ No newline at end of file