From 62c3bebcc58aaa14bbad23d1edef663f39e6bacb Mon Sep 17 00:00:00 2001 From: weigang Date: Tue, 15 Sep 2020 16:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=95=86=E5=93=81?= 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 eafe022..0a73a61 100644 --- a/app/Service/v3/Implementations/ActivityService.php +++ b/app/Service/v3/Implementations/ActivityService.php @@ -50,11 +50,13 @@ class ActivityService implements ActivityServiceInterface ->where(function ($query) { $query->where('time2', '>=', date('H:i')) ->orWhere('time4', '>=', date('H:i')); - }); + }) + ->where(''.$goodsTable.'.expire_time', '>', time()); return $builder->select(''.$goodsTable.'.*')->addSelect(''.$goodsTable.'.sales as total_sales') ->orderBy(''.$goodsTable.'.sort', 'DESC') ->orderBy(''.$goodsTable.'.expire_time', 'ASC') + ->orderBy(''.$goodsTable.'.created_at', 'DESC') ->get()->toArray(); } } \ No newline at end of file