no message

controllers/micro_roadshow.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
@@ -291,6 +292,7 @@ func (this *MicroRoadShowController) CommentAdd() {
 	if sourceType == 0 {
 		sourceType = 1
 	}
+	fmt.Println(sourceType)
 	item := models.CygxArticleComment{
 		UserId:      uid,
 		CreateTime:  time.Now(),
@@ -340,7 +342,7 @@ func (this *MicroRoadShowController) CommentAdd() {
 		go services.AddCygxAskserieVideoCollection(user, item.AskserieVideoId, req.Content)
 	}
 
-	if sourceType == 2 || sourceType == 3 {
+	if sourceType == 1 || sourceType == 2 {
 		detail, err := models.GetAddActivityInfoById(sourceId)
 		if err != nil {
 			br.Msg = "操作失败"

models/activity_video_history.go

@@ -67,7 +67,7 @@ func GetLastCygxActivityVideoHistory(activityId, userId int) (item *CygxActivity
 
 func UpdateLastCygxActivityVideoHistory(playSeconds string, lastId int) (err error) {
 	o := orm.NewOrm()
-	sql := ` UPDATE cygx_activity_video_history SET play_seconds =? WHERE id=? `
+	sql := ` UPDATE cygx_activity_video_history SET play_seconds = play_seconds +? WHERE id=? `
 	_, err = o.Raw(sql, playSeconds, lastId).Exec()
 	return
 }

models/activity_voice_history.go

@@ -37,7 +37,7 @@ func GetLastCygxActivityVoiceHistory(activityId, userId int) (item *CygxActivity
 
 func UpdateLastCygxActivityVoiceHistory(playSeconds string, lastId int) (err error) {
 	o := orm.NewOrm()
-	sql := ` UPDATE cygx_activity_voice_history SET play_seconds =? WHERE id=? `
+	sql := ` UPDATE cygx_activity_voice_history SET play_seconds = play_seconds +? WHERE id=? `
 	_, err = o.Raw(sql, playSeconds, lastId).Exec()
 	return
 }

models/micro_roadshow.go

@@ -569,10 +569,10 @@ func GetMicroRoadshowVideoById(videoId int) (item *MicroRoadshowVideo, err error
 	return
 }
 
-func UpdateCygxActivityVideoCounts(activityId int) (err error) {
+func UpdateCygxMicroRoadshowVideo(videoId int) (err error) {
 	sql := `UPDATE cygx_micro_roadshow_video SET video_counts = video_counts+1 WHERE video_id = ?  `
 	o := orm.NewOrm()
-	_, err = o.Raw(sql, activityId).Exec()
+	_, err = o.Raw(sql, videoId).Exec()
 	return
 }
 

services/cygx_activity_video_history.go

@@ -50,6 +50,11 @@ import (
 
 // 添加活动视频的播放记录
 func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds int) {
+	// 十分钟之内的合并
+	key := "CYGX_ACTIVITY_HISTORY" + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+	if utils.Rc.IsExist(key) && playSeconds == 0 {
+		return
+	}
 	var err error
 	defer func() {
 		if err != nil {
@@ -96,6 +101,8 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 			err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
 			return
 		}
+
+		utils.Rc.Put(key, 1, 10*time.Second)
 	} else {
 		//添加记录
 		e = models.AddCygxActivityVideoHistory(item)
@@ -117,6 +124,10 @@ 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)
+	if utils.Rc.IsExist(key) && playSeconds == 0 {
+		return
+	}
 	var err error
 	defer func() {
 		if err != nil {
@@ -155,6 +166,7 @@ func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds in
 			err = errors.New("UpdateLastCygxActivityVoiceHistory, Err: " + e.Error())
 			return
 		}
+		utils.Rc.Put(key, 1, 10*time.Second)
 	} else {
 		//添加记录
 		e = models.AddCygxActivityVoiceHistory(item)

services/micro_roadshow.go

@@ -1013,7 +1013,7 @@ func AddMicroRoadshowVideoRecord(user *models.WxUserItem, videoId, playSeconds i
 			err = errors.New("AddCygxMicroRoadshowVideoHistory, Err: " + e.Error())
 			return
 		}
-		e = models.UpdateCygxActivityVideoCounts(videoId)
+		e = models.UpdateCygxMicroRoadshowVideo(videoId)
 		if e != nil {
 			err = errors.New("UpdateCygxActivityVideoCounts, Err: " + e.Error())
 			return