调整

app/Admin/Controllers/ActivityController.php

@@ -79,7 +79,7 @@ class ActivityController extends AdminController
                             ->perPage(999)->loadDataOnce(true)
                             ->headerToolbar([])
                             ->title('')
-                            ->api(admin_url('user_activities?_action=getData&activity=${id}&perPage=999'))
+                            ->api(admin_url('user_activities?_action=getData&activity=${id}&is_rank=1&perPage=999'))
                             ->columns([
                                 amis()->TableColumn('${index +1}', '排名'),
                                 amis()->TableColumn('user.nick_name', __('admin.users.nick_name')),

app/Models/Activity.php

@@ -26,7 +26,7 @@ class Activity extends Model
     public function scopeSort($q)
     {
         $q->orderBy('state', 'asc')
-            ->orderBy('end_at', 'desc')
+            ->orderBy('end_at', 'asc')
             ->orderBy('created_at', 'desc');
     }
 

app/Models/Filters/UserActivityFilter.php

@@ -10,4 +10,12 @@ class UserActivityFilter extends ModelFilter
     public function activity($activity){
         return $this->where('activity_id', $activity);
     }
+
+    public function isRank($isRank){
+        if($isRank){
+            return $this->where('mark', '>', 0);
+        }else{
+            return;
+        }
+    }
 }

app/Services/Admin/ActivityService.php

@@ -84,7 +84,7 @@ class ActivityService extends BaseService
             //获取活动奖品；
             $activityGifts = $activity->gifts()->sort()->get();
             //获取当前排名；
-            $activityRanklist = $activity->logs()->sort()->get();
+            $activityRanklist = $activity->logs()->where('mark', '>', 0)->sort()->get();
             //组装获奖名单，并批量插入；
             $userGifts = $userIds = [];
             foreach($activityGifts as $gift){