jager/novatask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加社区列表接口，任务相关接口修改

Browse Source
This commit is contained in:
lianghuanjie
2024-12-19 21:14:14 +08:00
parent 391a9d3481
commit a3c4adfa25
32 changed files with 1163 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/logic/task/get_task_reward_logic.go
View File

@@ -35,9 +35,9 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
task, err := l.svcCtx.TaskModel.FindOne(l.ctx, req.ID)
if err != nil {
if errors.Is(err, model.ErrNotFound) {
return nil, errs.BadRequest(errs.ErrTaskNotFound, "task not found")
return nil, errs.New(errs.ErrTaskNotFound, "task not found")
}
return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
return nil, errs.New(errs.ErrDatabaseOperate, err)
}
var taskSeq int
if task.Type == model.TASKTYPE_DAILY_PAY {
@@ -47,15 +47,15 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
if err != nil {
if !errors.Is(err, model.ErrNotFound) {
l.Errorw("find task progress error", logx.Field("err", err))
return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
return nil, errs.New(errs.ErrDatabaseOperate, err)
}
return nil, errs.BadRequest(errs.ErrTaskNotFinished, "task not finished")
return nil, errs.New(errs.ErrTaskNotFinished, "task not finished")
}
switch {
case tp.Stage < model.TASK_PROGRESS_WAIT_REWARD:
return nil, errs.BadRequest(errs.ErrTaskNotFinished, "task not finished")
return nil, errs.New(errs.ErrTaskNotFinished, "task not finished")
case tp.Stage > model.TASK_PROGRESS_WAIT_REWARD:
return nil, errs.BadRequest(errs.ErrTaskAlreadyReward, "task already reward")
return nil, errs.New(errs.ErrTaskAlreadyReward, "task already reward")
}
// 修改状态,增加积分和记录都在事物中执行
@@ -85,7 +85,7 @@ func (l *GetTaskRewardLogic) GetTaskReward(req *types.TaskIdPath) (*types.GetTas
if err != nil {
l.Errorw("给予用户奖励实物执行失败", logx.Field("err", err), logx.Field("task", task.Id), logx.Field("uid", uid))
return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
return nil, errs.New(errs.ErrDatabaseOperate, err)
}
return &types.GetTaskRewardResp{Points: task.Points}, nil