no message

models/askserie_video_history_record.go

@@ -44,7 +44,7 @@ func GetLastCygxAskserieVideoHistoryRecord(activityId, userId int) (item *CygxAc
 
 func UpdateLastCygxAskserieVideoHistoryRecord(playSeconds string, lastId int) (err error) {
 	o := orm.NewOrm()
-	sql := ` UPDATE cygx_askserie_video_history_record SET video_duration = ? WHERE id=? `
+	sql := ` UPDATE cygx_askserie_video_history_record SET video_duration = video_duration+? WHERE id=? `
 	_, err = o.Raw(sql, playSeconds, lastId).Exec()
 	return
 }

models/micro_roadshow.go

@@ -576,6 +576,13 @@ func UpdateCygxMicroRoadshowVideo(videoId int) (err error) {
 	return
 }
 
+func UpdateLastCygxMicroRoadshowVideoHistory(playSeconds string, lastId int) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE cygx_micro_roadshow_video SET play_seconds = play_seconds +? WHERE id=? `
+	_, err = o.Raw(sql, playSeconds, lastId).Exec()
+	return
+}
+
 // GetMicroRoadshowVideoByIndustryIds 根据行业ID查询产业视频列表
 func GetMicroRoadshowVideoByIndustryIds(industrialIdArr []int) (list []*MicroRoadshowVideo, err error) {
 	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE industry_id in (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)  and publish_status = 1 `

services/askserie_video.go

@@ -42,8 +42,9 @@ func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, pla
 	if sellerItem != nil {
 		item.SellerName = sellerItem.RealName
 	}
-
+	fmt.Println(utils.Rc.IsExist(key))
 	if !utils.Rc.IsExist(key) {
+		fmt.Println("添加")
 		//添加记录
 		e = models.AddCygxAskserieVideoHistoryRecord(item)
 		if e != nil {
@@ -56,8 +57,9 @@ func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, pla
 			err = errors.New("UpdateActivityVideoCounts, Err: " + e.Error())
 			return
 		}
-		utils.Rc.Put(key, 1, 10*time.Second)
+		utils.Rc.Put(key, 1, 10*time.Minute)
 	} else {
+		fmt.Println("更新")
 		//更新停留时长
 		lastItem, e := models.GetLastCygxAskserieVideoHistoryRecord(askserieVideoId, user.UserId)
 		if e != nil {

services/cygx_activity_video_history.go

@@ -51,10 +51,11 @@ 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) && playSeconds == 0 {
+	if playSeconds == 0 {
 		return
 	}
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ACTIVITYVIDEO + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+
 	var err error
 	defer func() {
 		if err != nil {
@@ -88,22 +89,7 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 		item.SellerName = sellerItem.RealName
 	}
 
-	//小程序端的回传两次，第一次没有播放时长，第二次有播放时长
-	if playSeconds != 0 {
-		lastItem, e := models.GetLastCygxActivityVideoHistory(activityId, user.UserId)
-		if e != nil {
-			err = errors.New("GetLastCygxActivityVideoHistory, Err: " + e.Error())
-			return
-		}
-		//更新播放时长
-		e = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
-		if e != nil {
-			err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
-			return
-		}
-
-		utils.Rc.Put(key, 1, 10*time.Second)
-	} else {
+	if !utils.Rc.IsExist(key) {
 		//添加记录
 		e = models.AddCygxActivityVideoHistory(item)
 		if e != nil {
@@ -118,16 +104,63 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 		}
 		//设置消息提醒
 		go ActivityVideoUserRmind(user, activityId, 1)
+
+		utils.Rc.Put(key, 1, 10*time.Minute)
+	} else {
+		lastItem, e := models.GetLastCygxActivityVideoHistory(activityId, user.UserId)
+		if e != nil {
+			err = errors.New("GetLastCygxActivityVideoHistory, Err: " + e.Error())
+			return
+		}
+		//更新播放时长
+		e = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
+		if e != nil {
+			err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
+			return
+		}
 	}
+
+	////小程序端的回传两次，第一次没有播放时长，第二次有播放时长
+	//if playSeconds != 0 {
+	//	lastItem, e := models.GetLastCygxActivityVideoHistory(activityId, user.UserId)
+	//	if e != nil {
+	//		err = errors.New("GetLastCygxActivityVideoHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	//更新播放时长
+	//	e = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
+	//	if e != nil {
+	//		err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//
+	//	utils.Rc.Put(key, 1, 10*time.Minute)
+	//} else {
+	//	//添加记录
+	//	e = models.AddCygxActivityVideoHistory(item)
+	//	if e != nil {
+	//		err = errors.New("AddCygxActivityVideoHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	//播放记录加1
+	//	e = models.UpdateActivityVideoCounts(activityId)
+	//	if e != nil {
+	//		err = errors.New("UpdateActivityVideoCounts, Err: " + e.Error())
+	//		return
+	//	}
+	//	//设置消息提醒
+	//	go ActivityVideoUserRmind(user, activityId, 1)
+	//}
 	return
 }
 
 // 记录用户活动音频播放记录
 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) && playSeconds == 0 {
+	if playSeconds == 0 {
 		return
 	}
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ACTIVITYVOICE + strconv.Itoa(activityId) + "_" + strconv.Itoa(user.UserId)
+
 	var err error
 	defer func() {
 		if err != nil {
@@ -154,20 +187,8 @@ func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds in
 	if sellerItem != nil {
 		item.SellerName = sellerItem.RealName
 	}
-	//小程序端的回传两次，第一次没有播放时长，第二次有播放时长
-	if playSeconds != 0 {
-		lastItem, e := models.GetLastCygxActivityVoiceHistory(activityId, user.UserId)
-		if e != nil {
-			err = errors.New("GetLastCygxActivityVoiceHistory, Err: " + e.Error())
-			return
-		}
-		e = models.UpdateLastCygxActivityVoiceHistory(strconv.Itoa(playSeconds), lastItem.Id)
-		if e != nil {
-			err = errors.New("UpdateLastCygxActivityVoiceHistory, Err: " + e.Error())
-			return
-		}
-		utils.Rc.Put(key, 1, 10*time.Second)
-	} else {
+
+	if !utils.Rc.IsExist(key) {
 		//添加记录
 		e = models.AddCygxActivityVoiceHistory(item)
 		if e != nil {
@@ -180,8 +201,50 @@ func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds in
 			err = errors.New("UpdateCygxActivityVoiceCounts, Err: " + e.Error())
 			return
 		}
+		utils.Rc.Put(key, 1, 10*time.Minute)
 		//设置消息提醒
 		go ActivityVideoUserRmind(user, activityId, 2)
+	} else {
+		lastItem, e := models.GetLastCygxActivityVoiceHistory(activityId, user.UserId)
+		if e != nil {
+			err = errors.New("GetLastCygxActivityVoiceHistory, Err: " + e.Error())
+			return
+		}
+		e = models.UpdateLastCygxActivityVoiceHistory(strconv.Itoa(playSeconds), lastItem.Id)
+		if e != nil {
+			err = errors.New("UpdateLastCygxActivityVoiceHistory, Err: " + e.Error())
+			return
+		}
 	}
+
+	//小程序端的回传两次，第一次没有播放时长，第二次有播放时长
+	//if playSeconds != 0 {
+	//	lastItem, e := models.GetLastCygxActivityVoiceHistory(activityId, user.UserId)
+	//	if e != nil {
+	//		err = errors.New("GetLastCygxActivityVoiceHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	e = models.UpdateLastCygxActivityVoiceHistory(strconv.Itoa(playSeconds), lastItem.Id)
+	//	if e != nil {
+	//		err = errors.New("UpdateLastCygxActivityVoiceHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	utils.Rc.Put(key, 1, 10*time.Second)
+	//} else {
+	//	//添加记录
+	//	e = models.AddCygxActivityVoiceHistory(item)
+	//	if e != nil {
+	//		err = errors.New("AddCygxActivityVoiceHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	//播放记录加1
+	//	e = models.UpdateCygxActivityVoiceCounts(activityId)
+	//	if e != nil {
+	//		err = errors.New("UpdateCygxActivityVoiceCounts, Err: " + e.Error())
+	//		return
+	//	}
+	//	//设置消息提醒
+	//	go ActivityVideoUserRmind(user, activityId, 2)
+	//}
 	return
 }

services/micro_roadshow.go

@@ -970,10 +970,11 @@ func MicroRoadshowVideoUserRmind(user *models.WxUserItem, videoId int) (err erro
 
 // 记录产业视频播放记录
 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) && playSeconds == 0 {
+	if playSeconds == 0 {
 		return
 	}
+	key := utils.CYGX_VIDEO_HISTORY_KEY + utils.CYGX_OBJ_ROADSHOW + strconv.Itoa(videoId) + "_" + strconv.Itoa(user.UserId)
+
 	var err error
 	defer func() {
 		if err != nil {
@@ -1000,31 +1001,63 @@ func AddMicroRoadshowVideoRecord(user *models.WxUserItem, videoId, playSeconds i
 	if sellerItem != nil {
 		item.SellerName = sellerItem.RealName
 	}
-	if playSeconds != 0 {
-		lastItem, e := models.GetLastCygxMicroRoadshowVideoHistory(videoId, user.UserId)
+
+	if !utils.Rc.IsExist(key) {
+		//添加记录
+		e = models.AddCygxMicroRoadshowVideoHistory(item)
 		if e != nil {
-			err = errors.New("GetLastCygxMicroRoadshowVideoHistory, Err: " + e.Error())
+			err = errors.New("AddCygxMicroRoadshowVideoHistory, Err: " + e.Error())
 			return
 		}
-		e = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
+		//播放记录加1
+		e = models.UpdateCygxMicroRoadshowVideo(videoId)
 		if e != nil {
-			err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
+			err = errors.New("UpdateCygxActivityVideoCounts, Err: " + e.Error())
 			return
 		}
-		utils.Rc.Put(key, 1, 10*time.Second)
+		go MicroRoadshowVideoUserRmind(user, videoId)
+
+		utils.Rc.Put(key, 1, 10*time.Minute)
 	} else {
-		e = models.AddCygxMicroRoadshowVideoHistory(item)
+		//更新停留时长
+		lastItem, e := models.GetLastCygxMicroRoadshowVideoHistory(videoId, user.UserId)
 		if e != nil {
-			err = errors.New("AddCygxMicroRoadshowVideoHistory, Err: " + e.Error())
+			err = errors.New("GetLastCygxMicroRoadshowVideoHistory, Err: " + e.Error())
 			return
 		}
-		e = models.UpdateCygxMicroRoadshowVideo(videoId)
+		//更新播放时间
+		e = models.UpdateLastCygxMicroRoadshowVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
 		if e != nil {
-			err = errors.New("UpdateCygxActivityVideoCounts, Err: " + e.Error())
+			err = errors.New("UpdateLastCygxMicroRoadshowVideoHistory, Err: " + e.Error())
 			return
 		}
-		go MicroRoadshowVideoUserRmind(user, videoId)
 	}
 
+	//if playSeconds != 0 {
+	//	lastItem, e := models.GetLastCygxMicroRoadshowVideoHistory(videoId, user.UserId)
+	//	if e != nil {
+	//		err = errors.New("GetLastCygxMicroRoadshowVideoHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	e = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
+	//	if e != nil {
+	//		err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	utils.Rc.Put(key, 1, 10*time.Second)
+	//} else {
+	//	e = models.AddCygxMicroRoadshowVideoHistory(item)
+	//	if e != nil {
+	//		err = errors.New("AddCygxMicroRoadshowVideoHistory, Err: " + e.Error())
+	//		return
+	//	}
+	//	e = models.UpdateCygxMicroRoadshowVideo(videoId)
+	//	if e != nil {
+	//		err = errors.New("UpdateCygxActivityVideoCounts, Err: " + e.Error())
+	//		return
+	//	}
+	//	go MicroRoadshowVideoUserRmind(user, videoId)
+	//}
+
 	return
 }