From 8548206d33a6d7e06adbdf1392c5a883387b7033 Mon Sep 17 00:00:00 2001
From: liutk <961510893@qq.com>
Date: Wed, 10 Jul 2024 22:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Resources/Api/UserGameResource.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Http/Resources/Api/UserGameResource.php b/app/Http/Resources/Api/UserGameResource.php
index 7091f76..07aedeb 100644
--- a/app/Http/Resources/Api/UserGameResource.php
+++ b/app/Http/Resources/Api/UserGameResource.php
@@ -45,14 +45,15 @@ class UserGameResource extends JsonResource
                 return ($this->game?->state ?? 0) < 2 ?'0':($this->is_right ? '1':'2');
             }, '0'),
             'history' => $this->whenLoaded('userActivity', function () {
-                // if($num = UserGame::whereHas('game', function($q){
-                //     return $q->where('state', 2);
-                // })->where([
-                //     'user_id' => $this->user_id,
-                //     'activity_id' => $this->activity_id,
-                // ])->count() > 0) {
-                if($this->userActivity->join_times > 0) {
-                    return '最近他猜'.$this->userActivity->join_times.'中'.($this->userActivity->right_times ?? 0);
+                $num = UserGame::whereHas('game', function($q){
+                    return $q->where('state', 2);
+                })->where([
+                    'user_id' => $this->user_id,
+                    'activity_id' => $this->activity_id,
+                ])->count();
+                if($num > 0) {
+                // if($this->userActivity->join_times > 0) {
+                    return '最近他猜'.$num.'中'.($this->userActivity->right_times ?? 0);
                 }else{
                     return '';
                 }