u

app/Http/Controllers/api/ActivityReward.php

@@ -13,9 +13,7 @@ class ActivityReward extends BaseController
     public function index()
     {
         try {
-            request()->validate([
-                'member_id' => ['nullable', 'integer'],
-            ]);
+            request()->validate(['member_id' => ['nullable', 'integer']]);
             $memberId = request()->input('member_id');
             $time = time();
             $query = ActivityRewardModel::where(ActivityRewardService::getWhere([
@@ -23,20 +21,21 @@ class ActivityReward extends BaseController
                 'end_time' => ['>=', $time],
                 'status' => ActivityRewardModel::STATUS_UP
             ]));
-
             if (!empty($memberId)) {
                 $query->with(['userActivities' => function ($query1) use ($memberId) {
                     $query1->where('user_id', $memberId);
                 }]);
-                $list = $query->orderByDesc('id')->get();
-                $list->transform(function ($activity) {
-                    $activity->is_claimed = $activity->userActivities->isNotEmpty();
-                    return $activity;
-                })->toArray();
-            } else {
-                $list = $query->orderByDesc('id')->get()->toArray();
             }
+            $list = $query->orderByDesc('id')->get();
 
+            $list->transform(function ($activity) use ($memberId) {
+                if (!empty($memberId)) {
+                    $activity->is_claimed = $activity->userActivities->isNotEmpty();
+                } else {
+                    $activity->is_claimed = false;
+                }
+                return $activity;
+            })->toArray();
         } catch (ValidationException $e) {
             return $this->error($e->validator->errors()->first());
         } catch (Exception $e) {