From 5d64ee48e934252342e3acd49120fdcf98e2efe5 Mon Sep 17 00:00:00 2001 From: Robin <7434053+warrior_of_light_robin@user.noreply.gitee.com> Date: Fri, 13 Dec 2024 18:36:29 +0800 Subject: [PATCH] by Robin at 20241213 --- .../proto/activity_banner_api_vo.go | 2 +- .../activity_banner/proto/not_null_def_op.go | 2 +- .../activity_hot/proto/activity_hot_api_vo.go | 2 +- app/mix/service/utilservice.go | 2 +- dbstruct/activity_banner.go | 18 ++++++++++++++++-- dbstruct/activity_hot.go | 9 ++++++++- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/api/proto/activity_banner/proto/activity_banner_api_vo.go b/api/proto/activity_banner/proto/activity_banner_api_vo.go index d205902e..7205848c 100644 --- a/api/proto/activity_banner/proto/activity_banner_api_vo.go +++ b/api/proto/activity_banner/proto/activity_banner_api_vo.go @@ -18,6 +18,6 @@ func (vo *ActivityBannerApiVO) CopyActivityBanner(activityBanner *dbstruct.Activ } vo.Image = activityBanner.Image vo.Title = activityBanner.GetTitle() - vo.Hyperlinks = activityBanner.Hyperlinks + vo.Hyperlinks = activityBanner.GetHyperlinks() return vo } diff --git a/api/proto/activity_banner/proto/not_null_def_op.go b/api/proto/activity_banner/proto/not_null_def_op.go index bc4262a7..1abfa3e7 100644 --- a/api/proto/activity_banner/proto/not_null_def_op.go +++ b/api/proto/activity_banner/proto/not_null_def_op.go @@ -9,7 +9,7 @@ func (p *OpCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) { params = make([]*validator.JsonParam, 0) params = append(params, validator.NewStructPtrParam("请确认banner图片！", p.ActivityBanner.Image)) params = append(params, validator.NewStringPtrParam("请确认banner标题！", p.ActivityBanner.Title)) - params = append(params, validator.NewInt64SliceParam("请确认支持的设备类型！", p.ActivityBanner.DeviceType)) + params = append(params, validator.NewInt64SlicePtrParam("请确认支持的设备类型！", p.ActivityBanner.DeviceType)) params = append(params, validator.NewInt64PtrParam("请确认开始时间！", p.ActivityBanner.St)) params = append(params, validator.NewInt64PtrParam("请确认结束时间！", p.ActivityBanner.Et)) return params diff --git a/api/proto/activity_hot/proto/activity_hot_api_vo.go b/api/proto/activity_hot/proto/activity_hot_api_vo.go index 6649c143..bd62f596 100644 --- a/api/proto/activity_hot/proto/activity_hot_api_vo.go +++ b/api/proto/activity_hot/proto/activity_hot_api_vo.go @@ -31,7 +31,7 @@ func (vo *ActivityHotApiVO) CopyActivityHot(activityHot *dbstruct.ActivityHot) * vo.Image = activityHot.Image vo.Title = activityHot.GetTitle() vo.Text = activityHot.GetText() - vo.Hyperlinks = activityHot.Hyperlinks + vo.Hyperlinks = activityHot.GetHyperlinks() return vo } diff --git a/app/mix/service/utilservice.go b/app/mix/service/utilservice.go index f94ca6ab..a20beea1 100644 --- a/app/mix/service/utilservice.go +++ b/app/mix/service/utilservice.go @@ -2242,7 +2242,7 @@ func (s *Service) utilFillActivityHotApiVO(ctx *gin.Context, activityHotMp map[i if activityHot.Text == nil { // 文字内容为空，填充空间简介 vo.Text = zoneMp[mid][0].GetProfile() } - if len(activityHot.Hyperlinks) == 0 { // 超链接为空，填充空间链接 + if len(activityHot.GetHyperlinks()) == 0 { // 超链接为空，填充空间链接 vo.CopyHyperlinks(s.utilGetZoneHyperlinks) } volist = append(volist, vo) diff --git a/dbstruct/activity_banner.go b/dbstruct/activity_banner.go index 2917448e..128a797b 100644 --- a/dbstruct/activity_banner.go +++ b/dbstruct/activity_banner.go @@ -4,10 +4,10 @@ type ActivityBanner struct { Id *int64 `json:"id" bson:"_id"` // bannerId Image *MediaComponent `json:"image" bson:"image"` // 主图 Title *string `json:"title" bson:"title"` // 标题 - Hyperlinks []*Hyperlink `json:"hyperlinks" bson:"hyperlinks"` // 跳转链接 + Hyperlinks *[]*Hyperlink `json:"hyperlinks" bson:"hyperlinks"` // 跳转链接 St *int64 `json:"st" bson:"st"` // 开始时间 Et *int64 `json:"et" bson:"et"` // 结束时间 - DeviceType []int64 `json:"device_type" bson:"device_type"` // 支持的设备类型 + DeviceType *[]int64 `json:"device_type" bson:"device_type"` // 支持的设备类型 Priority *int64 `json:"priority" bson:"priority"` // 优先级 Status *int64 `json:"status" bson:"status"` // 状态 0-已生效，1-已暂停 Ct *int64 `json:"ct" bson:"ct"` // 创建时间 @@ -49,3 +49,17 @@ func (p *ActivityBanner) GetEt() int64 { } return *p.Et } + +func (p *ActivityBanner) GetHyperlinks() []*Hyperlink { + if p == nil || p.Hyperlinks == nil { + return make([]*Hyperlink, 0) + } + return *p.Hyperlinks +} + +func (p *ActivityBanner) GetDeviceType() []int64 { + if p == nil || p.Hyperlinks == nil { + return make([]int64, 0) + } + return *p.DeviceType +} diff --git a/dbstruct/activity_hot.go b/dbstruct/activity_hot.go index 7125a033..42e19b4f 100644 --- a/dbstruct/activity_hot.go +++ b/dbstruct/activity_hot.go @@ -6,7 +6,7 @@ type ActivityHot struct { Image *MediaComponent `json:"image" bson:"image"` // 主图 Title *string `json:"title" bson:"title"` // 标题 Text *string `json:"text" bson:"text"` // 文字内容 - Hyperlinks []*Hyperlink `json:"hyperlinks" bson:"hyperlinks"` // 跳转链接 + Hyperlinks *[]*Hyperlink `json:"hyperlinks" bson:"hyperlinks"` // 跳转链接 St *int64 `json:"st" bson:"st"` // 开始时间 Et *int64 `json:"et" bson:"et"` // 结束时间 Priority *int64 `json:"priority" bson:"priority"` // 优先级 @@ -71,3 +71,10 @@ func (p *ActivityHot) GetPriority() int64 { } return *p.Priority } + +func (p *ActivityHot) GetHyperlinks() []*Hyperlink { + if p == nil || p.Hyperlinks == nil { + return make([]*Hyperlink, 0) + } + return *p.Hyperlinks +} -- 2.41.0