Merge branch 'yb/3.5' into debug

models/response/report.go

@@ -47,6 +47,7 @@ type ReportItem struct {
 	ContentSub         string    `description:"内容前两个章节" json:"content_sub"`
 	BannerUrl          string    `description:"详情页banner" json:"banner_url"`
 	ShareBgImg         string    `description:"分享背景图" json:"share_bg_img"`
+	PptImgList         string    `description:"ppt的图片地址，多图用英文;隔开" json:"ppt_img_list"`
 }
 
 type ReportChapterItem struct {

models/tables/rddp/report/report.go

@@ -27,6 +27,7 @@ type Report struct {
 	ContentSub         string    `description:"内容前两个章节" json:"content_sub"`
 	ThsMsgIsSend       int       `description:"客户群消息是否已发送，0:否，1:是" json:"ths_msg_is_send"`
 	StageStr           string    `description:"期数" json:"stage_str"`
+	PptImgList         string    `description:"ppt的图片地址，多图用英文;隔开" json:"ppt_img_list"`
 }
 
 type UnReadItem struct {

services/report/report.go

@@ -433,6 +433,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 	reportItem.VideoSize = reportInfo.VideoSize
 	reportItem.VideoPlaySeconds = reportInfo.VideoPlaySeconds
 	reportItem.Author = reportInfo.Author
+	reportItem.PptImgList = reportInfo.PptImgList //ppt转图片的图
 	// 分享背景图取二级分类配图, 二级没有配图时使用一级配图, 一级也没有使用默认图
 	reportItem.ShareBgImg = utils.DEFAULT_REPORT_SHARE_BG_IMG
 	secondClassify, e := classify.GetByClassifyId(reportInfo.ClassifyIdSecond)
@@ -495,7 +496,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 		reportItem.Content = html.UnescapeString(reportInfo.Content)
 		reportItem.VideoUrl = reportInfo.VideoUrl
 		//查询点赞数
-		likeNum,likeEnabled, _ = services.GetReportLikeByReportIdOldReportId(userinfo.UserID, reportInfo.Id, 0,0,0)
+		likeNum, likeEnabled, _ = services.GetReportLikeByReportIdOldReportId(userinfo.UserID, reportInfo.Id, 0, 0, 0)
 	}
 
 	//新增用户访问日志
@@ -859,7 +860,7 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 			if classifyParent.ClassifyName == "晨报" && productAuthOk {
 				// 查询当前晨报的所有音频
 				if vList, ok := videoMap[reportInfo.Id]; ok {
-					for _,vd := range vList {
+					for _, vd := range vList {
 						vd.VideoImg = reportItem.ReportImgUrl
 					}
 					reportItem.VideoList = vList
@@ -871,7 +872,7 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 					if wAuth {
 						// 查询当前晨报的所有音频
 						if vList, ok2 := videoMap[reportInfo.Id]; ok2 {
-							for _,vd := range vList {
+							for _, vd := range vList {
 								vd.VideoImg = reportItem.ReportImgUrl
 							}
 							reportItem.VideoList = vList
@@ -1046,7 +1047,7 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
 			temp.ClassifyNameSecond = reportItem.ClassifyNameSecond
 			temp.Title = reportItem.Title
 			temp.ContentSub = reportItem.BodyContent
-			temp.PublishTime, err = time.ParseInLocation(utils.FormatDateTime, reportItem.PublishTime,time.Local)
+			temp.PublishTime, err = time.ParseInLocation(utils.FormatDateTime, reportItem.PublishTime, time.Local)
 
 			if len(v.Highlight["Title"]) > 0 {
 				temp.Title = v.Highlight["Title"][0]