新增排行榜用户昵称,
This commit is contained in:
@ -654,8 +654,8 @@ func (s *sReward) GetLift(ctx context.Context, in *model.GetRewardIn) (out *mode
|
|||||||
if count == 1 {
|
if count == 1 {
|
||||||
// 修改任务记录状态2
|
// 修改任务记录状态2
|
||||||
_, err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{Id: in.UserTaskId}).Data(do.UserTasks{
|
_, err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{Id: in.UserTaskId}).Data(do.UserTasks{
|
||||||
Status: 2,
|
Status: 2,
|
||||||
CompletedAt: gtime.Now(),
|
//CompletedAt: gtime.Now(),
|
||||||
}).Update()
|
}).Update()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -100,7 +100,7 @@ func (s *sTask) UserTaskRankingList(ctx context.Context, in *model.UserTaskRanki
|
|||||||
var total int
|
var total int
|
||||||
// SELECT `uid`,`nickname` FROM `user` ORDER BY `uid` asc
|
// 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())).
|
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").
|
WhereBetween(dao.UserTasks.Columns().CompletedAt, start, end).OrderDesc("num").OrderDesc("username").Group("user_id").
|
||||||
ScanAndCount(&list, &total, false)
|
ScanAndCount(&list, &total, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -103,6 +103,7 @@ type UserTaskRankingArgs struct {
|
|||||||
UserName string `orm:"username" json:"username"`
|
UserName string `orm:"username" json:"username"`
|
||||||
Avatar string `orm:"avatar" json:"avatar"`
|
Avatar string `orm:"avatar" json:"avatar"`
|
||||||
Total int `orm:"num" json:"num"`
|
Total int `orm:"num" json:"num"`
|
||||||
|
NickName string `orm:"nickname" json:"nickname"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type LoginUserRanking struct {
|
type LoginUserRanking struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user