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 ''; }