From 413decab8f1029db97b7cf6aded1f3613243da1d Mon Sep 17 00:00:00 2001
From: chy <2463300564@qq.com>
Date: Thu, 10 Jul 2025 09:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/logic/reward/reward.go | 4 ++--
 internal/logic/task/task.go     | 2 +-
 internal/model/userTask.go      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

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 {