Merge branch 'mfyx_3.6' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

models/activity_video.go

@@ -95,6 +95,14 @@ func GetCygxActivityVideoById(videoId int) (item *CygxActivityVideo, err error)
 	return
 }
 
+// 获取数量
+func GetCygxActivityVideoCount(activityId int) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_video   WHERE activity_id = ? `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, activityId).QueryRow(&count)
+	return
+}
+
 // 列表
 func GetActivityVideoList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoResp, err error) {
 	o := orm.NewOrm()

models/activity_voice.go

@@ -84,6 +84,14 @@ func GetCygxActivityVoiceById(videoId int) (item *CygxActivityVoice, err error)
 	return
 }
 
+// 获取数量
+func GetCygxActivityVoiceCount(activityId int) (count int, err error) {
+	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_activity_voice   WHERE activity_id = ? `
+	o := orm.NewOrm()
+	err = o.Raw(sqlCount, activityId).QueryRow(&count)
+	return
+}
+
 // 列表
 func GetActivityVoiceListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()

services/user_admin_share.go

@@ -61,13 +61,34 @@ func AddCygxUserAdminShareHistory(user *models.WxUserItem, source, sourceTitle,
 	if user.UserId == 0 {
 		return
 	}
+	var err error
+	//如果是已经上传了音视的活动不记录
+	if source == utils.CYGX_OBJ_ACTIVITY {
+		totalvi, e := models.GetCygxActivityVideoCount(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxActivityVideoCount, Err: " + e.Error())
+			return
+		}
+		if totalvi > 0 {
+			return
+		}
+		totalvo, e := models.GetCygxActivityVoiceCount(sourceId)
+		if e != nil {
+			err = errors.New("GetCygxActivityVoiceCount, Err: " + e.Error())
+			return
+		}
+		if totalvo > 0 {
+			return
+		}
+	}
+
 	//3秒之内多次请求，不重复记录
 	key := "CYGX_" + source + "_" + strconv.Itoa(sourceId) + "_" + strconv.Itoa(user.UserId)
 	if utils.Rc.IsExist(key) {
 		return
 	}
 	utils.Rc.Put(key, 1, 3*time.Second)
-	var err error
+
 	defer func() {
 		if err != nil {
 			fmt.Println(err)