diff --git a/internal/logic/reward/reward.go b/internal/logic/reward/reward.go index 0191b0d..0b7218b 100644 --- a/internal/logic/reward/reward.go +++ b/internal/logic/reward/reward.go @@ -1226,7 +1226,7 @@ func (s *sReward) GetNetfeeList(ctx context.Context, in *model.NetfeeListIn) (ou return nil, ecode.Fail.Sub("查询奖励类型id为空") } - var data []model.NetfeeRewards + var data model.NetfeeRewards var total int m := dao.Rewards.Ctx(ctx) if in.StartTime != nil && in.EndTime != nil { @@ -1238,7 +1238,7 @@ func (s *sReward) GetNetfeeList(ctx context.Context, in *model.NetfeeListIn) (ou } return &model.NetfeeListOut{ - List: data, - Total: total, + List: data.NetfeeUserTaskRewards, + Total: len(data.NetfeeUserTaskRewards), }, nil } diff --git a/internal/model/reward.go b/internal/model/reward.go index ab48933..5f9ea95 100644 --- a/internal/model/reward.go +++ b/internal/model/reward.go @@ -36,9 +36,9 @@ type Reward struct { type NetfeeRewards struct { g.Meta `orm:"table:rewards"` - Id int64 `json:"id" orm:"id" description:"奖励ID"` // 奖励ID - RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型ID,关联 reward_types 表"` // 奖励类型ID,关联 reward_types 表 - NetfeeUserTaskRewards NetfeeUserTaskRewards `json:"netfeeUserTaskRewards,omitempty" orm:"with:reward_id=id"` + Id int64 `json:"id" orm:"id" description:"奖励ID"` // 奖励ID + RewardTypeId int64 `json:"rewardTypeId" orm:"reward_type_id" description:"奖励类型ID,关联 reward_types 表"` // 奖励类型ID,关联 reward_types 表 + NetfeeUserTaskRewards []NetfeeUserTaskRewards `json:"netfeeUserTaskRewards,omitempty" orm:"with:reward_id=id"` } type NetfeeUserTaskRewards struct {