no message

controllers/micro_roadshow.go

@@ -119,6 +119,7 @@ func (this *MicroRoadShowController) List() {
 	mapaudioIds := make(map[int]int)         //活动音频
 	mapvideoIds := make(map[int]int)         // 微路演视频
 	mapactivityVideoIds := make(map[int]int) // 活动视频
+	mapAskserieVideoIds := make(map[int]int) // 问答系列音频
 	for _, item := range listMycollect {
 		if item.ActivityVoiceId > 0 {
 			mapaudioIds[item.ActivityVoiceId] = item.ActivityVoiceId
@@ -128,6 +129,20 @@ func (this *MicroRoadShowController) List() {
 			mapactivityVideoIds[item.ActivityVoiceId] = item.ActivityVoiceId
 		}
 	}
+
+	listAskserieVideoCollect, err := models.GetUserCygxAskserieVideoCollectList(userId)
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+
+	for _, v := range listAskserieVideoCollect {
+		if v.AskserieVideoId > 0 {
+			mapAskserieVideoIds[v.AskserieVideoId] = v.AskserieVideoId
+		}
+	}
+
 	for _, item := range list {
 		if item.Type == 1 {
 			//音频
@@ -144,6 +159,11 @@ func (this *MicroRoadShowController) List() {
 			if mapvideoIds[item.Id] > 0 {
 				item.IsCollect = true
 			}
+		} else if item.Type == 4 {
+			//系列问答视频
+			if mapAskserieVideoIds[item.SourceId] > 0 {
+				item.IsCollect = true
+			}
 		}
 
 		item.IndustrialManagementId = item.IndustryId
@@ -557,7 +577,7 @@ func (this *MicroRoadShowController) Collect() {
 		br.Success = true
 		br.Data = resp
 	} else if req.SourceType == 2 {
-		detail, err := models.GetCygxActivityVideoById(sourceId)
+		detail, err := models.GetCygxActivityVideoByActivityIdInfo(sourceId)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取信息失败,Err:" + err.Error()
@@ -678,6 +698,7 @@ func (this *MicroRoadShowController) Collect() {
 			item.AskserieVideoId = sourceId
 			item.UserId = uid
 			item.CreateTime = time.Now()
+			item.ModifyTime = time.Now()
 			item.Mobile = user.Mobile
 			item.Email = user.Email
 			item.CompanyId = user.CompanyId

services/askserie_video.go

@@ -60,6 +60,7 @@ func AddCygxAskserieVideoCollection(user *models.WxUserItem, askserieVideoId int
 	}()
 	item := new(models.CygxAskserieVideoCollection)
 	item.UserId = user.UserId
+	item.RealName = user.RealName
 	item.AskserieVideoId = askserieVideoId
 	item.Content = content
 	item.Mobile = user.Mobile

services/resource_data.go

@@ -325,40 +325,6 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetMicroRoadShowMycollect, Err: " + e.Error())
 			return
 		}
-
-		for _, item := range list {
-			if item.Type == 1 {
-				//音频
-				count, e := models.GetVoiceCollectCount(user.UserId, item.Id)
-				if e != nil {
-					err = errors.New("GetVoiceCollectCount, Err: " + e.Error())
-					return
-				}
-				if count > 0 {
-					item.IsCollect = true
-				}
-			} else if item.Type == 2 {
-				//活动视频
-				count, e := models.GetActivityVideoCollectCount(user.UserId, item.Id)
-				if e != nil {
-					err = errors.New("GetActivityVideoCollectCount, Err: " + e.Error())
-					return
-				}
-				if count > 0 {
-					item.IsCollect = true
-				}
-			} else if item.Type == 3 {
-				//微路演视频
-				count, e := models.GetVideoCollectCount(user.UserId, item.Id)
-				if e != nil {
-					err = errors.New("GetVideoCollectCount, Err: " + e.Error())
-					return
-				}
-				if count > 0 {
-					item.IsCollect = true
-				}
-			}
-		}
 		// 用户权限
 		authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 		if e != nil {

services/user.go

@@ -583,6 +583,61 @@ func GetMicroRoadShowMycollectV12(pageSize, currentIndex int, audioIds, activity
 		err = errors.New("获取微路演音视频列表失败, Err: " + e.Error())
 		return
 	}
+	userId := user.UserId
+	listMycollect, e := models.GetUserMicroRoadshowCollectList(userId)
+	if e != nil {
+		err = errors.New("GetUserMicroRoadshowCollectList, Err: " + e.Error())
+		return
+	}
+	mapaudioIds := make(map[int]int)         //活动音频
+	mapvideoIds := make(map[int]int)         // 微路演视频
+	mapactivityVideoIds := make(map[int]int) // 活动视频
+	mapAskserieVideoIds := make(map[int]int) // 活动视频
+	for _, item := range listMycollect {
+		if item.ActivityVoiceId > 0 {
+			mapaudioIds[item.ActivityVoiceId] = item.ActivityVoiceId
+		} else if item.VideoId > 0 {
+			mapvideoIds[item.VideoId] = item.VideoId
+		} else if item.ActivityVideoId > 0 {
+			mapactivityVideoIds[item.ActivityVoiceId] = item.ActivityVoiceId
+		}
+	}
+
+	listAskserieVideoCollect, e := models.GetUserCygxAskserieVideoCollectList(userId)
+	if e != nil {
+		err = errors.New("GetUserCygxAskserieVideoCollectList, Err: " + e.Error())
+		return
+	}
+
+	for _, v := range listAskserieVideoCollect {
+		if v.AskserieVideoId > 0 {
+			mapAskserieVideoIds[v.AskserieVideoId] = v.AskserieVideoId
+		}
+	}
+
+	for _, item := range videoList {
+		if item.Type == 1 {
+			//音频
+			if mapaudioIds[item.Id] > 0 {
+				item.IsCollect = true
+			}
+		} else if item.Type == 2 {
+			//活动视频
+			if mapactivityVideoIds[item.Id] > 0 {
+				item.IsCollect = true
+			}
+		} else if item.Type == 3 {
+			//微路演视频
+			if mapvideoIds[item.Id] > 0 {
+				item.IsCollect = true
+			}
+		} else if item.Type == 4 {
+			//系列问答视频
+			if mapAskserieVideoIds[item.SourceId] > 0 {
+				item.IsCollect = true
+			}
+		}
+	}
 	respList = videoList
 	return
 }