|
@@ -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 {
|