修改已购活动详情的文案

models/response/purchase/purchase.go

@@ -12,7 +12,8 @@ type PurchaseListItem struct {
 
 type Detail struct {
 	item
-	ReportImgUrl    string
+//	ImgUrl    string   `description:"背景图地址" json:"img_url"`
+	TopName         string   `description:"主标题" json:"top_name"`
 }
 
 type item struct {

services/activity/activity.go

@@ -245,13 +245,32 @@ func GetPurchaseList(permissionIds []int, offset, pageLimit int) (list []*purcha
 		return
 	}
 
+
+	var WeekDayMap = map[string]string{
+		"Monday":    "周一",
+		"Tuesday":   "周二",
+		"Wednesday": "周三",
+		"Thursday":  "周四",
+		"Friday":    "周五",
+		"Saturday":  "周六",
+		"Sunday":    "周日",
+	}
+
+
 	for _, item := range activityList {
 		temp := new(purchase.Detail)
 		temp.ActivityId = item.ActivityID
 		temp.Title = fmt.Sprintf("主讲：%s", item.Speaker)
-		temp.Content = fmt.Sprintf("活动时间：%s  %s", item.ModifyTime, item.ModifyTime)
+		// 时间处理
+		activityDate := item.StartTime.Format("2006-01-02")
+		activityStart := item.StartTime.Format("15:04")
+		activityEnd := item.EndTime.Format("15:04")
+		activityWeek := item.StartTime.Weekday().String()
+		weekStr := WeekDayMap[activityWeek]
+		timeStr := activityDate + " " + activityStart + "-" + activityEnd + " " + weekStr
+		temp.Content = fmt.Sprintf("活动时间：%s", timeStr)
 		temp.Time = item.ModifyTime
-
+		temp.TopName = item.ActivityName
 		list = append(list, temp)
 	}
 

services/report/report.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"hongze/hongze_yb/models/response/purchase"
 	"hongze/hongze_yb/models/tables/chart_permission_chapter_mapping"
-	"hongze/hongze_yb/models/tables/rddp/classify"
 	"hongze/hongze_yb/models/tables/rddp/report"
 	"hongze/hongze_yb/models/tables/rddp/report_chapter"
 	"hongze/hongze_yb/models/tables/rddp/report_view_log"
@@ -143,16 +142,6 @@ func GetPurchaseDetail(permissionIds []int, userId uint64, classifyNameFirst str
 			return
 		}
 
-		//获取所有分类
-		classifys, tErr := classify.GetAll()
-		if tErr != nil {
-			err = tErr
-			return
-		}
-		classMap := make(map[int]string)
-		for _, v := range classifys {
-			classMap[v.Id] = v.ReportImgUrl
-		}
 		//查询有效的章节
 		var chapter *report_chapter.ReportChapter
 		typeIds, tErr := report_chapter_type.GetEffectTypeID()
@@ -171,7 +160,6 @@ func GetPurchaseDetail(permissionIds []int, userId uint64, classifyNameFirst str
 			temp.Title = v.Title
 			temp.ClassifyIdSecond = v.ClassifyIdSecond
 			temp.ClassifyNameSecond = v.ClassifyNameSecond
-			temp.ReportImgUrl, _ = classMap[temp.ClassifyIdFirst]
 			if temp.ClassifyNameFirst == "晨报" || temp.ClassifyNameFirst == "周报" {  //晨报或者周报，查询最新的章节信息
 				if len(typeIds) <= 0 {
 					continue
@@ -181,15 +169,18 @@ func GetPurchaseDetail(permissionIds []int, userId uint64, classifyNameFirst str
 					return
 				}
 				temp.Content = fmt.Sprintf("【第%d期|FICC|%s】%s", temp.Stage, chapter.TypeName, temp.Title)
+				temp.TopName = temp.Title
 			}else{
 				if temp.ClassifyIdSecond > 0 {     //包含二级分类
 					temp.Content = fmt.Sprintf("【第%d期|FICC| %s】%s", temp.Stage, temp.ClassifyNameSecond, temp.ClassifyNameFirst)
-					temp.ReportImgUrl, _ = classMap[temp.ClassifyIdSecond]
+					temp.TopName = temp.ClassifyNameSecond
 				} else {                   //无二级分类
 					temp.Content = fmt.Sprintf("【第%d期|FICC】%s", temp.Stage, temp.ClassifyNameFirst)
+					temp.TopName = temp.ClassifyNameFirst
 				}
 			}
 			temp.Time = v.PublishTime
+
 			list = append(list, temp)
 		}
 	}