diff --git a/internal/logic/reward/reward.go b/internal/logic/reward/reward.go index 1ee34a2..0ae26d8 100644 --- a/internal/logic/reward/reward.go +++ b/internal/logic/reward/reward.go @@ -654,8 +654,8 @@ func (s *sReward) GetLift(ctx context.Context, in *model.GetRewardIn) (out *mode if count == 1 { // 修改任务记录状态2 _, err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{Id: in.UserTaskId}).Data(do.UserTasks{ - Status: 2, - CompletedAt: gtime.Now(), + Status: 2, + //CompletedAt: gtime.Now(), }).Update() if err != nil { diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go index 8999520..70c7605 100644 --- a/internal/logic/task/task.go +++ b/internal/logic/task/task.go @@ -100,7 +100,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki var total int // SELECT `uid`,`nickname` FROM `user` ORDER BY `uid` asc err = m.Page(in.Page, in.Size).LeftJoin(dao.Users.Table(), fmt.Sprintf("`%s`.`id` = `%s`.`user_id`", dao.Users.Table(), dao.UserTasks.Table())). - Fields("username,avatar,count(*) num").WhereIn(dao.UserTasks.Columns().Status, []int{2, 3}). + Fields("username,nickname,avatar,count(*) num").WhereIn(dao.UserTasks.Columns().Status, []int{2, 3}). WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id"). ScanAndCount(&list, &total, false) if err != nil { diff --git a/internal/model/userTask.go b/internal/model/userTask.go index 1d4d77d..f9616df 100644 --- a/internal/model/userTask.go +++ b/internal/model/userTask.go @@ -103,6 +103,7 @@ type UserTaskRankingArgs struct { UserName string `orm:"username" json:"username"` Avatar string `orm:"avatar" json:"avatar"` Total int `orm:"num" json:"num"` + NickName string `orm:"nickname" json:"nickname"` } type LoginUserRanking struct {