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

修改PC任务领取

Browse Source
This commit is contained in:
chy
2025-07-08 13:39:35 +08:00
parent 1a5cc50881
commit fd64b0fe7a
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/task/v1/task.go
View File

@ -86,6 +86,7 @@ type GetTaskReq struct {
GameId int `json:"gameId" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"` GameId int `json:"gameId" v:"required#游戏唯一id不能为空" dc:"游戏唯一id"`
TaskName string `json:"taskName" v:"required#任务名称不能为空" dc:"任务名称"` TaskName string `json:"taskName" v:"required#任务名称不能为空" dc:"任务名称"`
TaskType int `json:"taskType" v:"required#任务类型不能为空" dc:"任务类型1：每日 3：周期"` TaskType int `json:"taskType" v:"required#任务类型不能为空" dc:"任务类型1：每日 3：周期"`
UserTimes int `json:"userTimes" v:"required#完成次数不能为空" dc:"用户完成次数"`
} }
type GetTaskRes struct { type GetTaskRes struct {

1
internal/controller/task/task_v1_get_task.go
View File

@ -20,6 +20,7 @@ func (c *ControllerV1) GetTask(ctx context.Context, req *v1.GetTaskReq) (res *v1
GameId: req.GameId, GameId: req.GameId,
TaskName: req.TaskName, TaskName: req.TaskName,
TaskType: req.TaskType, TaskType: req.TaskType,
UserTimes: req.UserTimes,
}) })
if err != nil { if err != nil {
return nil, err return nil, err

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

@ -8,6 +8,7 @@ import (
"github.com/gogf/gf/v2/os/glog" "github.com/gogf/gf/v2/os/glog"
"github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
"github.com/gogf/gf/v2/util/guid"
"server/internal/consts" "server/internal/consts"
"server/internal/dao" "server/internal/dao"
"server/internal/model" "server/internal/model"
@ -389,7 +390,7 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
if err = dao.UserTasks.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) { if err = dao.UserTasks.Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) {
// 创建任务记录 // 创建任务记录
_, err = dao.UserTasks.Ctx(ctx).InsertAndGetId(do.UserTasks{ id, err := dao.UserTasks.Ctx(ctx).InsertAndGetId(do.UserTasks{
UserId: in.UserId, UserId: in.UserId,
TaskId: in.TaskId, TaskId: in.TaskId,
StoreId: storeId, StoreId: storeId,
@ -398,28 +399,31 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
TaskName: in.TaskName, TaskName: in.TaskName,
GameId: in.GameId, GameId: in.GameId,
TaskType: in.TaskType, TaskType: in.TaskType,
UserTimes: in.UserTimes,
}) })
if err != nil { if err != nil {
return ecode.Fail.Sub("创建用户任务记录失败") return ecode.Fail.Sub("创建用户任务记录失败")
} }
//查询该任务相关联的奖励, 创建对应奖励下发记录id //查询该任务相关联的奖励, 创建对应奖励下发记录id
//array, err := dao.TaskRewards.Ctx(ctx).LeftJoin(dao.Rewards.Table(), "rewards.id = task_rewards.reward_id").Where(do.TaskRewards{TaskId: in.TaskId}).Fields(dao.TaskRewards.Columns().RewardId).Fields(dao.Rewards.Columns().Name).All() array, err := dao.TaskRewards.Ctx(ctx).LeftJoin(dao.Rewards.Table(), "rewards.id = task_rewards.reward_id").Where(do.TaskRewards{TaskId: in.TaskId}).
//if err != nil { Fields(dao.TaskRewards.Columns().RewardId).Fields(dao.Rewards.Columns().Name).All()
// return ecode.Fail.Sub("获取任务关联奖励列表失败") if err != nil {
//} return ecode.Fail.Sub("获取任务关联奖励列表失败")
//for _, v := range array { }
// _, err = dao.UserTaskRewards.Ctx(ctx).Data(do.UserTaskRewards{ for _, v := range array {
// UserTaskId: id, _, err = dao.UserTaskRewards.Ctx(ctx).Data(do.UserTaskRewards{
// RewardId: v["reward_id"].Int64(), UserTaskId: id,
// RewardName: v["name"].String(), RewardId: v["reward_id"].Int64(),
// Status: consts.RewardInitStatus, RewardName: v["name"].String(),
// InnerOrderId: fmt.Sprintf("reward%s", guid.S()), Status: consts.RewardInitStatus,
// }).Insert() InnerOrderId: fmt.Sprintf("reward%s", guid.S()),
// if err != nil { IssueQuantity: 1,
// return ecode.Fail.Sub("创建用户任务奖励记录失败") }).Insert()
// } if err != nil {
//} return ecode.Fail.Sub("创建用户任务奖励记录失败")
}
}
return return
}); err != nil { }); err != nil {
return nil, err return nil, err

1
internal/model/userTask.go
View File

@ -122,6 +122,7 @@ type GetTaskIn struct {
TaskName string `json:"taskName"` TaskName string `json:"taskName"`
GameId int `json:"gid"` GameId int `json:"gid"`
TaskType int `json:"taskType"` TaskType int `json:"taskType"`
UserTimes int `json:"userTimes"`
} }
type GetTaskOut struct { type GetTaskOut struct {