From ffbc905ad94a6d9124169eb936c26215d1805d06 Mon Sep 17 00:00:00 2001 From: chy <2463300564@qq.com> Date: Sat, 5 Jul 2025 17:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E7=BD=91=E8=B4=B9=E5=A5=96=E5=8A=B1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/reward/reward.go | 6 +++--- internal/model/reward.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 {