From 696171e93d7ba39fdfd8d32c3bf4214008989f8a Mon Sep 17 00:00:00 2001
From: liutk <961510893@qq.com>
Date: Wed, 29 May 2024 18:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=8F=E6=97=A5=E7=AB=9E?=
 =?UTF-8?q?=E7=8C=9C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ActivityGameController.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/ActivityGameController.php b/app/Http/Controllers/Api/ActivityGameController.php
index 8d90ec0..4c306d5 100644
--- a/app/Http/Controllers/Api/ActivityGameController.php
+++ b/app/Http/Controllers/Api/ActivityGameController.php
@@ -31,9 +31,9 @@ class ActivityGameController extends ApiController
 
     public function latestGame(Request $request)
     {
-        //获取最新的活动；
-        $activity = Activity::show()->sort()->first();
-        $game = $activity?->games()->show()
+        $game = ActivityGame::whereHas('activity', function($q){
+                    return $q->where('state', '>' ,0);
+                })->show()
                 ->whereDate('game_at', now())
                 ->where('game_at', '>', now())
                 ->where('state', 1)
@@ -41,7 +41,9 @@ class ActivityGameController extends ApiController
 
         //若已经没有最新的活动了, 则拿取当天最后一个
         if(!$game){
-            $game = $activity?->games()->show()
+            $game = ActivityGame::whereHas('activity', function($q){
+                    return $q->where('state', '>' ,0);
+                })->show()
                 ->whereDate('game_at', now())
                 ->orderBy('game_at', 'desc')->first();
         }