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

调整可领取奖励列表，奖励领取记录

Browse Source
This commit is contained in:
chy
2025-07-04 14:27:34 +08:00
parent 4f9afe5df5
commit 9adc43f6e3
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/logic/reward/reward.go
View File

@ -1028,7 +1028,8 @@ func (s *sReward) GetUserClaimList(ctx context.Context, in *model.GetUserClaimLi
// Initialize result slice // Initialize result slice
rewards := make([]model.UserTaskRewards, 0) rewards := make([]model.UserTaskRewards, 0)
var total int var total int
if err = dao.UserTaskRewards.Ctx(ctx).Where(do.UserTaskRewards{UserTaskId: in.UserTaskId}).ScanAndCount(&rewards, &total, false); err != nil { if err = dao.UserTaskRewards.Ctx(ctx).Where(do.UserTaskRewards{UserTaskId: in.UserTaskId}).
LeftJoin(dao.Rewards.Table(), "r", "r.id = user_task_rewards.reward_id").Fields("user_task_rewards.*, r.image_url").ScanAndCount(&rewards, &total, false); err != nil {
return nil, ecode.Fail.Sub("查询用户领取列表异常") return nil, ecode.Fail.Sub("查询用户领取列表异常")
} }
return &model.GetUserClaimListOut{ return &model.GetUserClaimListOut{

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

@ -444,7 +444,8 @@ func (s *sTask) GetUserTaskRecordsList(ctx context.Context, in *model.UserTaskRe
orm = orm.Where(dao.UserTasks.Columns().GameId, in.GameId) orm = orm.Where(dao.UserTasks.Columns().GameId, in.GameId)
} }
err = orm.Page(in.Page, in.Size).ScanAndCount(&list, &total, false) err = orm.Page(in.Page, in.Size).LeftJoin(dao.UserTaskRewards.Table(), fmt.Sprintf("`%s`.`user_task_id` = `%s`.`id`", dao.UserTaskRewards.Table(), dao.UserTasks.Table())).
Fields("user_tasks.*, group_concat(user_task_rewards.reward_name SEPARATOR ',') AS reward_name").Group("user_tasks.id").ScanAndCount(&list, &total, false)
if err != nil { if err != nil {
return nil, ecode.Fail.Sub("获取用户任务列表失败") return nil, ecode.Fail.Sub("获取用户任务列表失败")
} }

1
internal/model/userTask.go
View File

@ -44,6 +44,7 @@ type UserTask2 struct {
StoreId int64 `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id StoreId int64 `json:"storeId" orm:"store_id" description:"门店 id"` // 门店 id
TaskName string `json:"taskName" orm:"task_name" description:"任务名称"` // 任务名称 TaskName string `json:"taskName" orm:"task_name" description:"任务名称"` // 任务名称
GameId int64 `json:"gameId" orm:"game_id" description:"游戏 id"` // 游戏 id GameId int64 `json:"gameId" orm:"game_id" description:"游戏 id"` // 游戏 id
RewardName string `json:"rewardName" orm:"reward_name" description:"奖励名称冗余字段"`
//TaskRewards []TaskReward `json:"taskRewards" orm:"with:task_id=task_id"` //TaskRewards []TaskReward `json:"taskRewards" orm:"with:task_id=task_id"`
} }

1
internal/model/userTaskReward.go
View File

@ -34,6 +34,7 @@ type UserTaskRewards struct {
IssueQuantity int `json:"issueQuantity" orm:"issue_quantity" description:""` // IssueQuantity int `json:"issueQuantity" orm:"issue_quantity" description:""` //
Source int64 `json:"source" orm:"source" description:"来源 1:系统 2：门店"` // 来源 1:系统 2：门店 Source int64 `json:"source" orm:"source" description:"来源 1:系统 2：门店"` // 来源 1:系统 2：门店
RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型 id"` RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型 id"`
ImgUrl string `json:"imgUrl" orm:"image_url"`
} }
type UserClaimReward struct { type UserClaimReward struct {

2
internal/packed/packed.go
View File

@ -4,7 +4,7 @@ import (
_ "github.com/gogf/gf/contrib/drivers/mysql/v2" _ "github.com/gogf/gf/contrib/drivers/mysql/v2"
_ "github.com/gogf/gf/contrib/nosql/redis/v2" _ "github.com/gogf/gf/contrib/nosql/redis/v2"
_ "server/utility/gamelife" _ "server/utility/gamelife"
_ "server/utility/mqtt/emqx" //_ "server/utility/mqtt/emqx"
_ "server/utility/myCasbin" _ "server/utility/myCasbin"
_ "server/utility/oss/aliyun" _ "server/utility/oss/aliyun"
_ "server/utility/rsa" _ "server/utility/rsa"