diff --git a/internal/controller/live/live_v1_get_live.go b/internal/controller/live/live_v1_get_live.go index a2a853f..4f30391 100644 --- a/internal/controller/live/live_v1_get_live.go +++ b/internal/controller/live/live_v1_get_live.go @@ -12,7 +12,7 @@ import ( func (c *ControllerV1) GetLive(ctx context.Context, req *v1.GetLiveReq) (res *v1.GetLiveRes, err error) { res = &v1.GetLiveRes{} now := time.Now() - err = dao.GoLives.Ctx(ctx).With(entity.GoUsers{}).Where("start_time >=? or status = 1", now).OrderAsc("start_time").Scan(&res.List) + err = dao.GoLives.Ctx(ctx).With(entity.GoUsers{}).Where("start_time >=? or status = 1", now).Order("status desc, start_time asc").Scan(&res.List) for i, live := range res.List { res.List[i].Reservation, err = dao.GoLiveReservations.Ctx(ctx).Wheref("live_id =? and user_id =?", live.Id, req.UserId).Count() }