denghui/arenax-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改任务领取

Browse Source
This commit is contained in:
chy
2025-07-09 14:33:44 +08:00
parent c1056552da
commit d8b4bcf1a0
1 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/logic/task/task.go
View File

@ -368,20 +368,19 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
// 当天结束时间 // 当天结束时间
end := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location()) end := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location())
err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId}). err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId}).
WhereBetween(dao.UserTasks.Columns().CreatedAt, start, end).WhereNot("status", 3).Scan(&userTask) WhereBetween(dao.UserTasks.Columns().CreatedAt, start, end).Scan(&userTask)
} else { } else {
err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId}).WhereNot("status", 3).Scan(&userTask) err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId}).Scan(&userTask)
} }
if err != nil { if err != nil {
return nil, ecode.Fail.Sub("查询用户该任务记录失败") return nil, ecode.Fail.Sub("查询用户该任务记录失败")
} }
//if userTask != nil { if userTask != nil {
// return nil, ecode.Fail.Sub("该任务记录已存在") return nil, ecode.Fail.Sub("该任务记录已存在")
//} }
if userTask == nil {
// TODO 流水号未知 // TODO 流水号未知
serialNumber, err := snowid.GetSnowClient().GenerateSerialNumber() serialNumber, err := snowid.GetSnowClient().GenerateSerialNumber()
if err != nil { if err != nil {
@ -433,7 +432,6 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
}); err != nil { }); err != nil {
return nil, err return nil, err
} }
}
return &model.GetTaskOut{ return &model.GetTaskOut{
Success: true, Success: true,