no message

models/cygx/activity_video.go

@@ -148,3 +148,11 @@ func GetActivityVideoList(condition string, pars []interface{}) (items []*CygxAc
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 删除数据
+func DeleteCygxActivityVideo(activityId int) (err error) {
+	o := orm.NewOrm()
+	sql := ` DELETE FROM cygx_activity_video WHERE  activity_id= ? `
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}

models/cygx/activity_voice.go

@@ -35,7 +35,7 @@ func UpdateCygxActivityVoice(item *CygxActivityVoice) (err error) {
 	to := orm.NewOrm()
 	updateParams := make(map[string]interface{})
 	updateParams["VoiceName"] = item.VoiceName
-	updateParams["VideoDuration"] = item.VoicePlaySeconds
+	updateParams["VoicePlaySeconds"] = item.VoicePlaySeconds
 	updateParams["VoiceUrl"] = item.VoiceUrl
 	ptrStructOrTableName := "cygx_activity_voice"
 	whereParam := map[string]interface{}{"activity_id": item.ActivityId}
@@ -87,3 +87,11 @@ func GetCygxActivityVoiceReqDetail(activityId int) (item *CygxActivityVoice, err
 	err = o.Raw(sql, activityId).QueryRow(&item)
 	return
 }
+
+// 删除数据
+func DeleteCygxActivityVoice(activityId int) (err error) {
+	o := orm.NewOrm()
+	sql := ` DELETE FROM cygx_activity_voice WHERE  activity_id= ? `
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}

services/cygx/activity_ocr.go

@@ -165,7 +165,7 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 	var condition string
 	var pars []interface{}
 	//处理音频
-	if itemVoice != nil {
+	if itemVoice.ActivityId > 0 {
 		condition = " AND activity_id = ? "
 		pars = append(pars, activityId)
 		total, e := cygx.GetCygxActivityVoiceCount(condition, pars)
@@ -173,8 +173,8 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetCygxActivityVoiceCount" + e.Error())
 			return
 		}
-		//如果大于0就新增，反之就修改
-		if total > 0 {
+		//如果等于0就新增，反之就修改
+		if total == 0 {
 			newId, e := cygx.AddCygxActivityVoice(itemVoice)
 			if e != nil {
 				err = errors.New("GetCygxActivityVoiceCount" + e.Error())
@@ -191,7 +191,7 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 	}
 
 	//处理视频
-	if itemVideo != nil {
+	if itemVideo.ActivityId > 0 {
 		condition = " AND art.activity_id = ? "
 		pars = append(pars, activityId)
 		total, e := cygx.GetActivityVideoCount(condition, pars)
@@ -199,8 +199,8 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetActivityVideoCount" + e.Error())
 			return
 		}
-		//如果大于0就新增，反之就修改
-		if total > 0 {
+		//如果等于0就新增，反之就修改
+		if total == 0 {
 			newId, e := cygx.AddCygxActivityVideo(itemVideo)
 			if e != nil {
 				err = errors.New("AddCygxActivityVideo" + e.Error())
@@ -217,13 +217,18 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 	}
 
 	//如果两个都为空，就判断之前是否上传过
-	if itemVoice == nil && itemVideo == nil {
+	if itemVoice.ActivityId == 0 && itemVideo.ActivityId == 0 {
 		voiceDetail, e := cygx.GetCygxActivityVoiceReqDetail(activityId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
 			return
 		}
 		if voiceDetail != nil {
+			e = cygx.DeleteCygxActivityVoice(activityId)
+			if e != nil {
+				err = errors.New("DeleteCygxActivityVoice" + e.Error())
+				return
+			}
 			go UpdateResourceData(voiceDetail.ActivityVoiceId, utils.CYGX_OBJ_ACTIVITYVOICE, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动音频在 cygx_resource_data 表中删除
 		}
 
@@ -234,6 +239,11 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			return
 		}
 		if videoDetail != nil {
+			e = cygx.DeleteCygxActivityVideo(activityId)
+			if e != nil {
+				err = errors.New("DeleteCygxActivityVideo" + e.Error())
+				return
+			}
 			go UpdateResourceData(videoDetail.VideoId, utils.CYGX_OBJ_ACTIVITYVIDEO, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动视频在 cygx_resource_data 表中删除
 		}
 	}