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

17
internal/logic/task/verify_task_result_logic.go
View File

@@ -27,14 +27,14 @@ func NewVerifyTaskResultLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
}
}
func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.VerifyTaskResultResp, error) {
func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.VerifyTaskResultReq) (*types.VerifyTaskResultResp, error) {
uid := cast.ToStringMapInt(l.ctx.Value("data"))["id"]
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 {
@@ -44,7 +44,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
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)
}
tp = &model.NhTaskProgress{
Uid: uid,
@@ -54,7 +54,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
}
}
if tp.Stage == model.TASK_PROGRESS_REWARDED {
return nil, errs.BadRequest(errs.ErrTaskAlreadyReward, "task already reward")
return nil, errs.New(errs.ErrTaskAlreadyReward, "task already reward")
}
// todo: 校验用户是否完成该任务
switch task.Type {
@@ -62,7 +62,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
tw, err := l.svcCtx.TwitterModel.FindOneByUid(l.ctx, uint(uid))
if err != nil {
if !errors.Is(err, model.ErrNotFound) {
return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
return nil, errs.New(errs.ErrDatabaseOperate, err)
}
return &types.VerifyTaskResultResp{Finish: false}, nil
}
@@ -72,6 +72,9 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
case model.TASKTYPE_BIND_DISCORD:
case model.TASKTYPE_DAILY_PAY:
if req.Params == "" {
return &types.VerifyTaskResultResp{Finish: false}, nil
}
default:
}
@@ -84,7 +87,7 @@ func (l *VerifyTaskResultLogic) VerifyTaskResult(req *types.TaskIdPath) (*types.
if err != nil {
l.Errorw("update task progress error", logx.Field("err", err))
return nil, errs.InternalServer(errs.ErrDatabaseOperate, err)
return nil, errs.New(errs.ErrDatabaseOperate, err)
}
return &types.VerifyTaskResultResp{Finish: true}, nil