no message

controllers/micro_roadshow.go

@@ -234,7 +234,6 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 		br.Ret = 408
 		return
 	}
-	uid := user.UserId
 	var req models.AddVideoHistoryReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -248,13 +247,6 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 	if sourceType == 0 {
 		sourceType = 1
 	}
-	var sellerName string
-	sellerName, err = models.GetCompanySellerName(user.CompanyId)
-	if err != nil {
-		br.Msg = "报名失败！"
-		br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
-		return
-	}
 	if sourceType == 1 {
 		//添加活动音频的播放记录
 		go services.AddActivityVoiceHistory(user, sourceId, playSeconds)
@@ -262,47 +254,8 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 		//添加活动视频的播放记录
 		go services.AddActivityVideoHistory(user, sourceId, playSeconds)
 	} else if sourceType == 3 {
-		item := models.CygxMicroRoadshowVideoHistory{
-			VideoId:     sourceId,
-			UserId:      uid,
-			Mobile:      user.Mobile,
-			Email:       user.Email,
-			CompanyId:   user.CompanyId,
-			CompanyName: user.CompanyName,
-			RealName:    user.RealName,
-			SellerName:  sellerName,
-			PlaySeconds: strconv.Itoa(playSeconds),
-			CreateTime:  time.Now(),
-			ModifyTime:  time.Now(),
-		}
-		if playSeconds != 0 {
-			lastItem, err := models.GetLastCygxMicroRoadshowVideoHistory(sourceId, user.UserId)
-			if err != nil {
-				br.Msg = "操作失败"
-				br.ErrMsg = "操作失败,GetLastCygxMicroRoadshowVideoHistory Err:" + err.Error()
-				return
-			}
-			err = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
-			if err != nil {
-				br.Msg = "更新失败"
-				br.ErrMsg = "更新失败,UpdateLastCygxActivityVideoHistory Err:" + err.Error()
-				return
-			}
-		} else {
-			err = models.AddCygxMicroRoadshowVideoHistory(&item)
-			if err != nil {
-				br.Msg = "操作失败"
-				br.ErrMsg = "操作失败,Err:" + err.Error()
-				return
-			}
-			err = models.UpdateCygxActivityVideoCounts(sourceId)
-			if err != nil {
-				br.Msg = "更新失败"
-				br.ErrMsg = "更新失败,Err:" + err.Error()
-				return
-			}
-		}
-		go services.MicroRoadshowVideoUserRmind(user, sourceId)
+		// 添加产业视频播放记录
+		go services.AddMicroRoadshowVideoRecord(user, sourceId, playSeconds)
 	} else if sourceType == 4 {
 		go services.AddAskserieVideoHistoryRecord(user, sourceId, playSeconds)
 	}

models/micro_roadshow_video_history.go

@@ -6,21 +6,22 @@ import (
 )
 
 type CygxMicroRoadshowVideoHistory struct {
-	Id          int       `orm:"column(id);pk"description:"微路演视频浏览记录表id"`
-	VideoId     int       `description:"微路演视频id"`
-	UserId      int       `description:"用户id"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司Id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
-	PlaySeconds string    `description:"播放时间 单位s"`
-	CreateTime  time.Time `description:"视频创建时间"`
-	ModifyTime  time.Time `description:"视频修改时间"`
+	Id               int       `orm:"column(id);pk"description:"微路演视频浏览记录表id"`
+	VideoId          int       `description:"微路演视频id"`
+	UserId           int       `description:"用户id"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司Id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	PlaySeconds      string    `description:"播放时间 单位s"`
+	CreateTime       time.Time `description:"视频创建时间"`
+	ModifyTime       time.Time `description:"视频修改时间"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
-//获取列表信息根据手机号分组
+// 获取列表信息根据手机号分组
 func GetMicroRoadshowVideoHistoryByMobileList(condition string) (items []*CygxMicroRoadshowVideoHistory, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_micro_roadshow_video_history  WHERE 1 =1  ` + condition + `  GROUP BY user_id  `
@@ -28,7 +29,7 @@ func GetMicroRoadshowVideoHistoryByMobileList(condition string) (items []*CygxMi
 	return
 }
 
-//修改用户浏览产业视频的相关信息
+// 修改用户浏览产业视频的相关信息
 func UpdateCygxMicroRoadshowVideoHistory(wxUser *WxUserItem) (err error) {
 	o := orm.NewOrm()
 	var sql string

services/askserie_video.go

@@ -19,6 +19,7 @@ func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, pla
 	}()
 	item := new(models.CygxAskserieVideoHistoryRecord)
 	item.UserId = user.UserId
+	item.RealName = user.RealName
 	item.AskserieVideoId = askserieVideoId
 	item.VideoDuration = playSeconds
 	item.Mobile = user.Mobile
@@ -36,19 +37,6 @@ func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, pla
 	if sellerItem != nil {
 		item.SellerName = sellerItem.RealName
 	}
-	//添加记录
-	e = models.AddCygxAskserieVideoHistoryRecord(item)
-	if e != nil {
-		err = errors.New("AddCygxAskserieVideoHistoryRecord, Err: " + e.Error())
-		return
-	}
-	//播放记录加1
-	e = models.UpdateAskserieVideoCounts(askserieVideoId)
-	if e != nil {
-		err = errors.New("UpdateAskserieVideoCounts, Err: " + e.Error())
-		return
-	}
-
 	if playSeconds != 0 {
 		lastItem, e := models.GetLastCygxAskserieVideoHistoryRecord(askserieVideoId, user.UserId)
 		if e != nil {
@@ -56,22 +44,23 @@ func AddAskserieVideoHistoryRecord(user *models.WxUserItem, askserieVideoId, pla
 			return
 		}
 		//更新播放时间
-		e = models.UpdateLastCygxActivityVideoHistory(strconv.Itoa(playSeconds), lastItem.Id)
+		e = models.UpdateLastCygxAskserieVideoHistoryRecord(strconv.Itoa(playSeconds), lastItem.Id)
 		if e != nil {
-			err = errors.New("UpdateLastCygxActivityVideoHistory, Err: " + e.Error())
+			err = errors.New("UpdateLastCygxAskserieVideoHistoryRecord, Err: " + e.Error())
 			return
 		}
-		//播放记录加1
-		e = models.UpdateActivityVideoCounts(askserieVideoId)
+
+	} else {
+		//添加记录
+		e = models.AddCygxAskserieVideoHistoryRecord(item)
 		if e != nil {
-			err = errors.New("UpdateActivityVideoCounts, Err: " + e.Error())
+			err = errors.New("AddCygxAskserieVideoHistoryRecord, Err: " + e.Error())
 			return
 		}
-	} else {
-		//添加记录
-		e = models.AddCygxActivityVideoHistory(item)
+		//播放记录加1
+		e = models.UpdateAskserieVideoCounts(askserieVideoId)
 		if e != nil {
-			err = errors.New("AddCygxActivityVideoHistory, Err: " + e.Error())
+			err = errors.New("UpdateActivityVideoCounts, Err: " + e.Error())
 			return
 		}
 	}
@@ -89,6 +78,7 @@ func AddCygxAskserieVideoCollection(user *models.WxUserItem, askserieVideoId int
 	}()
 	item := new(models.CygxAskserieVideoCollection)
 	item.UserId = user.UserId
+	item.RealName = user.RealName
 	item.AskserieVideoId = askserieVideoId
 	item.Content = content
 	item.Mobile = user.Mobile

services/cygx_activity_video_history.go

@@ -84,18 +84,12 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 			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
 		}
-		//播放记录加1
-		e = models.UpdateActivityVideoCounts(activityId)
-		if e != nil {
-			err = errors.New("UpdateActivityVideoCounts, Err: " + e.Error())
-			return
-		}
 	} else {
 		//添加记录
 		e = models.AddCygxActivityVideoHistory(item)
@@ -103,9 +97,15 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 			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)
 	}
-	//设置消息提醒
-	go ActivityVideoUserRmind(user, activityId, 1)
 	return
 }
 
@@ -149,12 +149,6 @@ func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds in
 			err = errors.New("UpdateLastCygxActivityVoiceHistory, Err: " + e.Error())
 			return
 		}
-		//播放记录加1
-		e = models.UpdateCygxActivityVoiceCounts(activityId)
-		if e != nil {
-			err = errors.New("UpdateCygxActivityVoiceCounts, Err: " + e.Error())
-			return
-		}
 	} else {
 		//添加记录
 		e = models.AddCygxActivityVoiceHistory(item)
@@ -162,9 +156,14 @@ func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds in
 			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)
 	}
-
-	//设置消息提醒
-	go ActivityVideoUserRmind(user, activityId, 2)
 	return
 }

services/micro_roadshow.go

@@ -8,6 +8,7 @@ import (
 	"hongze/hongze_cygx/utils"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // GetMicroRoadShowDefaultImgConfig 获取微路演默认图/分享图配置
@@ -965,3 +966,59 @@ func MicroRoadshowVideoUserRmind(user *models.WxUserItem, videoId int) (err erro
 	}
 	return
 }
+
+// 记录产业视频播放记录
+func AddMicroRoadshowVideoRecord(user *models.WxUserItem, videoId, playSeconds int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg(fmt.Sprint("记录用户活动音频播放记录失败 AddMicroRoadshowVideoRecord Err:", err.Error(), "videoId：", videoId, "UserId：", user.UserId), 2)
+		}
+	}()
+	item := new(models.CygxMicroRoadshowVideoHistory)
+	item.UserId = user.UserId
+	item.RealName = user.RealName
+	item.VideoId = videoId
+	item.PlaySeconds = strconv.Itoa(playSeconds)
+	item.Mobile = user.Mobile
+	item.Email = user.Email
+	item.CompanyId = user.CompanyId
+	item.CompanyName = user.CompanyName
+	item.CreateTime = time.Now()
+	item.ModifyTime = time.Now()
+	item.RegisterPlatform = utils.REGISTER_PLATFORM
+	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
+		return
+	}
+	if sellerItem != nil {
+		item.SellerName = sellerItem.RealName
+	}
+	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
+		}
+	} else {
+		e = models.AddCygxMicroRoadshowVideoHistory(item)
+		if e != nil {
+			err = errors.New("AddCygxMicroRoadshowVideoHistory, Err: " + e.Error())
+			return
+		}
+		e = models.UpdateCygxActivityVideoCounts(videoId)
+		if e != nil {
+			err = errors.New("UpdateCygxActivityVideoCounts, Err: " + e.Error())
+			return
+		}
+		go MicroRoadshowVideoUserRmind(user, videoId)
+	}
+
+	return
+}