diff --git a/internal/dao/internal/store_task_rewards.go b/internal/dao/internal/store_task_rewards.go index 8db17ae..7c7ab6a 100644 --- a/internal/dao/internal/store_task_rewards.go +++ b/internal/dao/internal/store_task_rewards.go @@ -22,7 +22,7 @@ type StoreTaskRewardsDao struct { // StoreTaskRewardsColumns defines and stores column names for the table store_task_rewards. type StoreTaskRewardsColumns struct { Id string // 任务奖励关联ID - TaskId string // 门店任务ID + TaskId string // 腾讯任务ID RewardId string // 奖励ID StoreId string // 门店ID CreatedAt string // 创建时间 diff --git a/internal/dao/internal/user_tasks.go b/internal/dao/internal/user_tasks.go index 73bf579..302440b 100644 --- a/internal/dao/internal/user_tasks.go +++ b/internal/dao/internal/user_tasks.go @@ -23,7 +23,7 @@ type UserTasksDao struct { type UserTasksColumns struct { Id string // 用户任务唯一标识符 UserId string // 用户ID - TaskId string // 任务ID + TaskId string // 腾讯任务ID Status string // 任务状态：1=进行中，2=已完成中，3=未完成 SerialNumber string // 流水号，确保用户任务唯一性 CreatedAt string // 创建时间 diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go index 8119052..3b597de 100644 --- a/internal/logic/task/task.go +++ b/internal/logic/task/task.go @@ -170,9 +170,8 @@ func (s *sTask) GetNonLoginTaskList(ctx context.Context, in *model.GetNonLoginTa } // 组装门店奖励数据 - err := dao.Tasks.Ctx(ctx).InnerJoin(dao.StoreTaskRewards.Table(), fmt.Sprintf("%s.%s = %s.%s", dao.Tasks.Table(), dao.Tasks.Columns().Id, dao.StoreTaskRewards.Table(), dao.StoreTaskRewards.Columns().TaskId)). - InnerJoin(dao.Rewards.Table(), fmt.Sprintf("%s.%s = %s.%s", dao.StoreTaskRewards.Table(), dao.StoreTaskRewards.Columns().RewardId, dao.Rewards.Table(), dao.Rewards.Columns().Id)). - Where(dao.Tasks.Columns().QqNetbarTaskId, task.TaskID).Fields(fmt.Sprintf("%s.*", dao.Rewards.Table())).Scan(&data.NetbarRewards) + err := dao.StoreTaskRewards.Ctx(ctx).InnerJoin(dao.Rewards.Table(), fmt.Sprintf("%s.%s = %s.%s", dao.StoreTaskRewards.Table(), dao.StoreTaskRewards.Columns().RewardId, dao.Rewards.Table(), dao.Rewards.Columns().Id)). + Where(dao.StoreTaskRewards.Columns().TaskId, task.TaskID).Fields(fmt.Sprintf("%s.*", dao.Rewards.Table())).Scan(&data.NetbarRewards) if err != nil { return nil, err } @@ -187,11 +186,42 @@ func (s *sTask) GetNonLoginTaskList(ctx context.Context, in *model.GetNonLoginTa func (s *sTask) GetLoginTaskList(ctx context.Context, in *model.GetLoginTaskListIn) (out *model.GetLoginTaskListOut, err error) { // 调用外部接口 - - // 任务列表数据处理 - return &model.GetLoginTaskListOut{ - Data: nil, - }, err + //activity, err := gamelife.GetGamelifeClient(ctx).RequestActivity(ctx, &model.QQNetbarActivityIn{ServiceName: consts.GetNonLoginTaskList, TaskParam: model.TaskParam{Gid: in.Gid, NetBarAccount: in.NetBarAccount, Num: in.Num, Pageidx: in.Pageidx}}) + //if err != nil { + // return nil, err + //} + //result, ok := activity.(*model.GameTaskResponse) + //if !ok { + // return nil, ecode.Fail.Sub("数据类型转换失败") + //} + //// 剔除不需要的任务数据 + //var tasks []model.Task + //for _, task := range result.TaskList { + // data := model.Task{ + // QqNetbarTaskId: task.TaskID, + // QqNetbarTaskName: task.Title, + // QqNetbarTaskMemo: task.TaskDesc, + // QqNetbarTaskRules: task.RuleDesc, + // QqNetbarReward: task.TargetName, + // QqNetbarTargetTime: task.TargetTimes, + // StartTime: task.CycleStart, + // EndTime: task.CycleEnd, + // } + // + // // 组装门店奖励数据 + // err := dao.Tasks.Ctx(ctx).InnerJoin(dao.StoreTaskRewards.Table(), fmt.Sprintf("%s.%s = %s.%s", dao.Tasks.Table(), dao.Tasks.Columns().Id, dao.StoreTaskRewards.Table(), dao.StoreTaskRewards.Columns().TaskId)). + // InnerJoin(dao.Rewards.Table(), fmt.Sprintf("%s.%s = %s.%s", dao.StoreTaskRewards.Table(), dao.StoreTaskRewards.Columns().RewardId, dao.Rewards.Table(), dao.Rewards.Columns().Id)). + // Where(dao.Tasks.Columns().QqNetbarTaskId, task.TaskID).Fields(fmt.Sprintf("%s.*", dao.Rewards.Table())).Scan(&data.NetbarRewards) + // if err != nil { + // return nil, err + // } + // tasks = append(tasks, data) + //} + // + //return &model.GetNonLoginTaskListOut{ + // Data: tasks, + //}, err + return nil, err } func (s *sTask) GetTaskList(ctx context.Context, in *model.TaskListIn) (out *model.TaskListOut, err error) { diff --git a/internal/model/do/store_task_rewards.go b/internal/model/do/store_task_rewards.go index 2523941..32a3e93 100644 --- a/internal/model/do/store_task_rewards.go +++ b/internal/model/do/store_task_rewards.go @@ -13,7 +13,7 @@ import ( type StoreTaskRewards struct { g.Meta `orm:"table:store_task_rewards, do:true"` Id interface{} // 任务奖励关联ID - TaskId interface{} // 门店任务ID + TaskId interface{} // 腾讯任务ID RewardId interface{} // 奖励ID StoreId interface{} // 门店ID CreatedAt *gtime.Time // 创建时间 diff --git a/internal/model/do/user_tasks.go b/internal/model/do/user_tasks.go index 4967147..63e47a5 100644 --- a/internal/model/do/user_tasks.go +++ b/internal/model/do/user_tasks.go @@ -14,7 +14,7 @@ type UserTasks struct { g.Meta `orm:"table:user_tasks, do:true"` Id interface{} // 用户任务唯一标识符 UserId interface{} // 用户ID - TaskId interface{} // 任务ID + TaskId interface{} // 腾讯任务ID Status interface{} // 任务状态：1=进行中，2=已完成中，3=未完成 SerialNumber interface{} // 流水号，确保用户任务唯一性 CreatedAt *gtime.Time // 创建时间 diff --git a/internal/model/entity/store_task_rewards.go b/internal/model/entity/store_task_rewards.go index 355b5c9..b88075f 100644 --- a/internal/model/entity/store_task_rewards.go +++ b/internal/model/entity/store_task_rewards.go @@ -11,7 +11,7 @@ import ( // StoreTaskRewards is the golang structure for table store_task_rewards. type StoreTaskRewards struct { Id int64 `json:"id" orm:"id" description:"任务奖励关联ID"` // 任务奖励关联ID - TaskId int64 `json:"taskId" orm:"task_id" description:"门店任务ID"` // 门店任务ID + TaskId string `json:"taskId" orm:"task_id" description:"腾讯任务ID"` // 腾讯任务ID RewardId int64 `json:"rewardId" orm:"reward_id" description:"奖励ID"` // 奖励ID StoreId int64 `json:"storeId" orm:"store_id" description:"门店ID"` // 门店ID CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"` // 创建时间 diff --git a/internal/model/entity/user_tasks.go b/internal/model/entity/user_tasks.go index f6fd34e..a088f29 100644 --- a/internal/model/entity/user_tasks.go +++ b/internal/model/entity/user_tasks.go @@ -12,7 +12,7 @@ import ( type UserTasks struct { Id int64 `json:"id" orm:"id" description:"用户任务唯一标识符"` // 用户任务唯一标识符 UserId int64 `json:"userId" orm:"user_id" description:"用户ID"` // 用户ID - TaskId int64 `json:"taskId" orm:"task_id" description:"任务ID"` // 任务ID + TaskId string `json:"taskId" orm:"task_id" description:"腾讯任务ID"` // 腾讯任务ID Status int `json:"status" orm:"status" description:"任务状态：1=进行中，2=已完成中，3=未完成"` // 任务状态：1=进行中，2=已完成中，3=未完成 SerialNumber string `json:"serialNumber" orm:"serial_number" description:"流水号，确保用户任务唯一性"` // 流水号，确保用户任务唯一性 CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"` // 创建时间 diff --git a/internal/model/task.go b/internal/model/task.go index d2eb042..86aa25a 100644 --- a/internal/model/task.go +++ b/internal/model/task.go @@ -7,9 +7,9 @@ import ( type Task struct { Id int64 `json:"id" orm:"id" description:"任务唯一标识符"` // 任务唯一标识符 - CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"` // 创建时间 - UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"` // 更新时间 - DeletedAt *gtime.Time `json:"deletedAt" orm:"deleted_at" description:"软删除时间戳"` // 软删除时间戳 + CreatedAt *gtime.Time `json:"-" orm:"created_at" description:"创建时间"` // 创建时间 + UpdatedAt *gtime.Time `json:"-" orm:"updated_at" description:"更新时间"` // 更新时间 + DeletedAt *gtime.Time `json:"-" orm:"deleted_at" description:"软删除时间戳"` // 软删除时间戳 GameId int64 `json:"gameId" orm:"game_id" description:"游戏唯一id"` // 游戏唯一id StoreId int64 `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id Status int `json:"status" orm:"status" description:"1：启用 2：禁用"` // 1：启用 2：禁用 diff --git a/utility/gamelife/gamelife.go b/utility/gamelife/gamelife.go index 9ab992e..b6d85af 100644 --- a/utility/gamelife/gamelife.go +++ b/utility/gamelife/gamelife.go @@ -329,6 +329,9 @@ func (s *gamelifeClient) RequestActivity(ctx context.Context, in *model.QQNetbar return nil, ecode.Fail.Sub("请求失败") } return &result, nil + case consts.GetTaskList: + + return nil, nil default: return nil, ecode.Fail.Sub("不支持的任务") }