Merge branch '7.6_local' into cygx/7.6

# Conflicts:
#	models/micro_roadshow.go

controllers/activity.go

@@ -4949,6 +4949,12 @@ func (this *ActivityCoAntroller) ActivityVoiceHistoryAdd() {
 			br.ErrMsg = "操作失败,Err:" + err.Error()
 			return
 		}
+		err = models.UpdateCygxActivityVoiceCounts(activityId)
+		if err != nil {
+			br.Msg = "更新失败"
+			br.ErrMsg = "更新失败,Err:" + err.Error()
+			return
+		}
 	}
 	br.Ret = 200
 	br.Success = true

controllers/micro_roadshow.go

@@ -193,6 +193,12 @@ func (this *MicroRoadShowController) VideoHistoryAdd() {
 			br.ErrMsg = "操作失败,Err:" + err.Error()
 			return
 		}
+		err = models.UpdateCygxActivityVideoCounts(videoId)
+		if err != nil {
+			br.Msg = "更新失败"
+			br.ErrMsg = "更新失败,Err:" + err.Error()
+			return
+		}
 	}
 	br.Ret = 200
 	br.Success = true

models/activity_voice.go

@@ -13,6 +13,8 @@ type CygxActivityVoice struct {
 	VoiceUrl         string    `description:"音频地址"`
 	VoiceName        string    `description:"音频名称"`
 	VoicePlaySeconds string    `description:"音频时长"`
+	VoiceCounts         int    `description:"播放量"`
+	ModifyTime          string `description:"更新时间"`
 	CreateTime       time.Time `description:"创建时间"`
 }
 
@@ -39,3 +41,10 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 	_, err = o.Raw(sql, activityIds).QueryRows(&items)
 	return
 }
+
+func UpdateCygxActivityVoiceCounts(activityId int) (err error) {
+	sql := `UPDATE cygx_activity_voice SET voice_counts = voice_counts+1 WHERE activity_id = ?  `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}

models/micro_roadshow.go

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