wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

by Robin at 20241213

This commit is contained in:
Robin 2024-12-13 18:36:29 +08:00
parent 65d1dfa03e
commit 5d64ee48e9
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/proto/activity_banner/proto/activity_banner_api_vo.go
View File

@ -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
}

2
api/proto/activity_banner/proto/not_null_def_op.go
View File

@ -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

2
api/proto/activity_hot/proto/activity_hot_api_vo.go
View File

@ -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
}

2
app/mix/service/utilservice.go
View File

@ -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)

18
dbstruct/activity_banner.go
View File

@ -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
}

9
dbstruct/activity_hot.go
View File

@ -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
}