解决 bug
This commit is contained in:
@ -523,10 +523,11 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out
|
||||
result.TaskList[i].Status = 1
|
||||
} else {
|
||||
// 存在用户记录,自行判断用户是否完成任务
|
||||
if v.UserTimes-one["user_times"].Int64() >= v.TargetTimes {
|
||||
completeTime := gtime.Now()
|
||||
userTaskStatus := one["status"].Int64()
|
||||
if userTaskStatus == 1 {
|
||||
userTaskStatus := one["status"].Int64()
|
||||
|
||||
if userTaskStatus == 1 {
|
||||
if v.UserTimes-one["user_times"].Int64() >= v.TargetTimes {
|
||||
completeTime := gtime.Now()
|
||||
if err := dao.UserTasks.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
|
||||
// 用户任务完成修改任务记录完成时间
|
||||
_, err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: v.TaskID}).Data(do.UserTasks{CompletedAt: completeTime}).Update()
|
||||
@ -569,16 +570,17 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out
|
||||
return nil, err
|
||||
}
|
||||
result.TaskList[i].Status = 2
|
||||
} else if userTaskStatus == 3 {
|
||||
result.TaskList[i].Status = 2
|
||||
} else {
|
||||
result.TaskList[i].Status = 3
|
||||
result.TaskList[i].UserTimes -= one["user_times"].Int64()
|
||||
result.TaskList[i].Status = 1
|
||||
}
|
||||
} else if userTaskStatus == 3 {
|
||||
result.TaskList[i].Status = 2
|
||||
} else {
|
||||
result.TaskList[i].UserTimes -= one["user_times"].Int64()
|
||||
result.TaskList[i].Status = 1
|
||||
result.TaskList[i].Status = 3
|
||||
}
|
||||
result.TaskList[i].UserTaskId = one["id"].Int64()
|
||||
|
||||
}
|
||||
}
|
||||
out.PageIdx = result.PageIdx
|
||||
|
||||
Reference in New Issue
Block a user