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:40:42 +08:00
parent fd64b0fe7a
commit 4d8122a4e9
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ 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"
@ -390,7 +389,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) {
// 创建任务记录 // 创建任务记录
id, err := dao.UserTasks.Ctx(ctx).InsertAndGetId(do.UserTasks{ _, err = dao.UserTasks.Ctx(ctx).InsertAndGetId(do.UserTasks{
UserId: in.UserId, UserId: in.UserId,
TaskId: in.TaskId, TaskId: in.TaskId,
StoreId: storeId, StoreId: storeId,
@ -405,25 +404,25 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge
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}). //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() // Fields(dao.TaskRewards.Columns().RewardId).Fields(dao.Rewards.Columns().Name).All()
if err != nil { //if err != nil {
return ecode.Fail.Sub("获取任务关联奖励列表失败") // return ecode.Fail.Sub("获取任务关联奖励列表失败")
} //}
for _, v := range array { //for _, v := range array {
_, err = dao.UserTaskRewards.Ctx(ctx).Data(do.UserTaskRewards{ // _, err = dao.UserTaskRewards.Ctx(ctx).Data(do.UserTaskRewards{
UserTaskId: id, // UserTaskId: id,
RewardId: v["reward_id"].Int64(), // RewardId: v["reward_id"].Int64(),
RewardName: v["name"].String(), // RewardName: v["name"].String(),
Status: consts.RewardInitStatus, // Status: consts.RewardInitStatus,
InnerOrderId: fmt.Sprintf("reward%s", guid.S()), // InnerOrderId: fmt.Sprintf("reward%s", guid.S()),
IssueQuantity: 1, // IssueQuantity: 1,
}).Insert() // }).Insert()
if err != nil { // if err != nil {
return ecode.Fail.Sub("创建用户任务奖励记录失败") // return ecode.Fail.Sub("创建用户任务奖励记录失败")
} // }
} //}
return return
}); err != nil { }); err != nil {
return nil, err return nil, err