Merge branch 'cygx_12.4' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/micro_roadshow.go

@@ -390,7 +390,12 @@ func (this *MicroRoadShowController) CommentAdd() {
 		item.Title = activityVoiceInfo.VoiceName
 		item.ActivityVoiceId = activityVoiceInfo.ActivityVoiceId
 		title = activityVoiceInfo.VoiceName
-		//resourceId = activityVoiceInfo.ActivityId
+		err = models.UpdateActivityVoiceCommentNum(sourceId)
+		if err == nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "操作失败 ,更新活动音频留言次数失败：" + strconv.Itoa(sourceId)
+			return
+		}
 	} else if sourceType == 2 {
 		activityInfo, _ := models.GetCygxActivityVideoByActivityIdInfo(sourceId)
 		if activityInfo == nil {
@@ -402,7 +407,12 @@ func (this *MicroRoadShowController) CommentAdd() {
 		item.VideoId = activityInfo.Id
 		item.ActivityId = activityInfo.ActivityId
 		title = activityInfo.Title
-		//resourceId = activityInfo.ActivityId
+		err = models.UpdateActivityVideoCommentNum(sourceId)
+		if err == nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "操作失败 ,更新活动视频留言次数失败：" + strconv.Itoa(sourceId)
+			return
+		}
 	} else if sourceType == 3 {
 		item.VideoId = sourceId
 		microVideo, e := models.GetMicroRoadshowVideoById(sourceId)
@@ -421,7 +431,7 @@ func (this *MicroRoadShowController) CommentAdd() {
 		go services.AddCygxAskserieVideoCollection(user, item.AskserieVideoId, req.Content)
 	}
 	var isResearch bool // 是否属于研选
-	if sourceType == 2 || sourceType == 3 {
+	if sourceType == 1 || sourceType == 2 {
 		detail, err := models.GetAddActivityInfoById(sourceId)
 		if err != nil {
 			br.Msg = "操作失败"
@@ -663,7 +673,6 @@ func (this *MicroRoadShowController) Collect() {
 			br.Msg = "收藏成功"
 			resp.Status = 1
 			// 文章收藏消息发送
-			//go services.ArticleUserRemind(user, detail, 2)
 		} else {
 			err = models.RemoveAskserieVideoCollect(uid, sourceId)
 			if err != nil {

models/activity_video.go

@@ -167,3 +167,10 @@ func GetActivityVideoActivityIds() (activityIds string, err error) {
 	err = o.Raw(sql).QueryRow(&activityIds)
 	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
+}

models/activity_voice.go

@@ -123,3 +123,10 @@ func GetActivityVoiceActivityIds() (activityIds string, err error) {
 	err = o.Raw(sql).QueryRow(&activityIds)
 	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
+}

services/askserie_video.go

@@ -5,11 +5,18 @@ import (
 	"fmt"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/utils"
+	"strconv"
 	"time"
 )
 
 // 记录用户活动音频播放记录
 func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, playSeconds int) {
+	// 十分钟之内的合并
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ASKSERIEVIDEO + strconv.Itoa(askserieVideoId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) {
+		return
+	}
+	utils.Rc.Put(key, 1, 10*time.Second)
 	var err error
 	defer func() {
 		if err != nil {

services/cygx_activity_video_history.go

@@ -50,6 +50,12 @@ import (
 
 // 记录用户活动音频播放记录
 func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds int) {
+	// 十分钟之内的合并
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ACTIVITYVIDEO + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) {
+		return
+	}
+	utils.Rc.Put(key, 1, 10*time.Second)
 	var err error
 	defer func() {
 		if err != nil {
@@ -101,6 +107,11 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 
 // 记录用户活动音频播放记录
 func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds int) {
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ACTIVITYVOICE + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) {
+		return
+	}
+	utils.Rc.Put(key, 1, 10*time.Second)
 	var err error
 	defer func() {
 		if err != nil {

services/micro_roadshow.go

@@ -761,6 +761,12 @@ func GetAskserieVideoDetailById(user *models.WxUserItem, askserieVideoId int) (i
 
 // 记录产业视频播放记录
 func AddMicroRoadshowVideoRecord(user *models.WxUserItem, videoId, playSeconds int) {
+	// 十分钟之内的合并
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ROADSHOW + strconv.Itoa(videoId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) {
+		return
+	}
+	utils.Rc.Put(key, 1, 10*time.Second)
 	var err error
 	defer func() {
 		if err != nil {

utils/constants.go

@@ -246,7 +246,8 @@ const (
 )
 
 const (
-	CYGX_YANXUAN_SPECIAL               = "研选专栏" //用户阅读数据
+	CYGX_YANXUAN_SPECIAL               = "研选专栏"                   //用户阅读数据
+	CYGX_VIDEO_HISTORY_KEY             = "CYGX_VIDEO_HISTORY_WEB" //路演播放Key 小程序、web端
 	CYGX_YANXUAN_SPECIAL_IMG_PC string = "https://hzstatic.hzinsights.com/cygx/yanxuan_special/special_img_pc.png"
 )