xingzai 1 ano atrás
pai
commit
1187d06d10

+ 12 - 1
controllers/micro_roadshow.go

@@ -315,6 +315,12 @@ func (this *MicroRoadShowController) CommentAdd() {
 		}
 		item.ActivityId = sourceId
 		item.ActivityVoiceId = activityVoiceInfo.ActivityVoiceId
+		err = models.UpdateActivityVoiceCommentNum(sourceId)
+		if err == nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "操作失败 ,更新活动音频留言次数失败:" + strconv.Itoa(sourceId)
+			return
+		}
 		//resourceId = activityVoiceInfo.ActivityId
 	} else if sourceType == 2 {
 		activityInfo, _ := models.GetCygxActivityVideoByActivityId(sourceId)
@@ -325,6 +331,12 @@ func (this *MicroRoadShowController) CommentAdd() {
 		}
 		item.VideoId = activityInfo.VideoId
 		item.ActivityId = sourceId
+		err = models.UpdateActivityVideoCommentNum(sourceId)
+		if err == nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "操作失败 ,更新活动视频留言次数失败:" + strconv.Itoa(sourceId)
+			return
+		}
 		//resourceId = activityInfo.ActivityId
 	} else if sourceType == 3 {
 		item.VideoId = sourceId
@@ -338,7 +350,6 @@ func (this *MicroRoadShowController) CommentAdd() {
 		//resourceId = microVideo.IndustryId
 	} else if sourceType == 4 {
 		item.AskserieVideoId = sourceId
-
 		go services.AddCygxAskserieVideoCollection(user, item.AskserieVideoId, req.Content)
 	}
 

+ 7 - 0
models/activity_video.go

@@ -122,6 +122,13 @@ func GetActivityVideoActivityIds() (activityIds string, err error) {
 	return
 }
 
+func UpdateActivityVideoCommentNum(activityId int) (err error) {
+	sql := `UPDATE cygx_activity_video SET comment_num = comment_num+1 WHERE activity_id = ?  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}
+
 // 修改
 func UpdateCygxActivityVideo(item *CygxActivityVideo) (err error) {
 	to := orm.NewOrm()

+ 7 - 0
models/activity_voice.go

@@ -130,6 +130,13 @@ func GetActivityVoiceActivityIds() (activityIds string, err error) {
 	return
 }
 
+func UpdateActivityVoiceCommentNum(activityId int) (err error) {
+	sql := `UPDATE cygx_activity_voice SET comment_num = comment_num+1 WHERE activity_id = ?  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}
+
 // 修改
 func UpdateCygxActivityVoice(item *CygxActivityVoice) (err error) {
 	to := orm.NewOrm()

+ 5 - 1
services/askserie_video.go

@@ -11,6 +11,10 @@ import (
 
 // 记录用户活动音频播放记录
 func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, playSeconds int) {
+	key := "CYGX_VIDEO_HISTORY" + utils.CYGX_OBJ_ASKSERIEVIDEO + strconv.Itoa(askserieVideoId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) && playSeconds == 0 {
+		return
+	}
 	var err error
 	defer func() {
 		if err != nil {
@@ -49,7 +53,7 @@ func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, pla
 			err = errors.New("UpdateLastCygxAskserieVideoHistoryRecord, Err: " + e.Error())
 			return
 		}
-
+		utils.Rc.Put(key, 1, 10*time.Second)
 	} else {
 		//添加记录
 		e = models.AddCygxAskserieVideoHistoryRecord(item)

+ 2 - 2
services/cygx_activity_video_history.go

@@ -51,7 +51,7 @@ import (
 // 添加活动视频的播放记录
 func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds int) {
 	// 十分钟之内的合并
-	key := "CYGX_ACTIVITY_HISTORY" + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+	key := "CYGX_VIDEO_HISTORY" + utils.CYGX_OBJ_ACTIVITYVIDEO + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
 	if utils.Rc.IsExist(key) && playSeconds == 0 {
 		return
 	}
@@ -124,7 +124,7 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 
 // 记录用户活动音频播放记录
 func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds int) {
-	key := "CYGX_ACTIVITY_HISTORY" + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+	key := "CYGX_VIDEO_HISTORY" + utils.CYGX_OBJ_ACTIVITYVOICE + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
 	if utils.Rc.IsExist(key) && playSeconds == 0 {
 		return
 	}

+ 8 - 3
services/micro_roadshow.go

@@ -325,7 +325,7 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		case 2:
 			videoAct += ` OR  a.activity_id =  ` + strconv.Itoa(sourceId)
 		case 3:
-			videoMico += ` OR  a.id =  ` + strconv.Itoa(sourceId)
+			videoMico += ` OR  a.video_id =  ` + strconv.Itoa(sourceId)
 		case 4:
 			conditionAskserie += ` OR  a.askserie_video_id =  ` + strconv.Itoa(sourceId)
 		}
@@ -334,9 +334,9 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 	if filter == "1" {
 		audioAct += ` AND b.chart_permission_id  = 0 `
 	} else if filter == "2" {
-		videoAct += ` AND b.chart_permission_id = 0`
+		videoAct += ` AND b.chart_permission_id = 0 `
 		videoMico += ` AND a.chart_permission_id  = 0 `
-		conditionAskserie += ` AND a.chart_permission_id   = 0 `
+		conditionAskserie += ` AND a.chart_permission_id = 0 `
 	}
 
 	if searchType != "" {
@@ -970,6 +970,10 @@ func MicroRoadshowVideoUserRmind(user *models.WxUserItem, videoId int) (err erro
 
 // 记录产业视频播放记录
 func AddMicroRoadshowVideoRecord(user *models.WxUserItem, videoId, playSeconds int) {
+	key := "CYGX_VIDEO_HISTORY" + utils.CYGX_OBJ_ROADSHOW + strconv.Itoa(videoId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) && playSeconds == 0 {
+		return
+	}
 	var err error
 	defer func() {
 		if err != nil {
@@ -1007,6 +1011,7 @@ func AddMicroRoadshowVideoRecord(user *models.WxUserItem, videoId, playSeconds i
 			err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
 			return
 		}
+		utils.Rc.Put(key, 1, 10*time.Second)
 	} else {
 		e = models.AddCygxMicroRoadshowVideoHistory(item)
 		if e != nil {