Merge branch 'cygx/cygx_fix_bug_11-03' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/cygx/activity_ocr.go

@@ -183,7 +183,6 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				return
 			}
 			go UpdateActivityVoiceResourceData(int(newId)) //写入首页最新  cygx_resource_data 表
-			//go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVOICE, "add", activityInfo.ActivityTime) // 把活动音频的数据添加到 cygx_resource_data 表
 
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVoice.VoiceName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
@@ -193,6 +192,21 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				return
 			}
 		}
+	} else {
+		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 UpdateActivityVoiceResourceData(voiceDetail.ActivityVoiceId) //写入首页最新  cygx_resource_data 表
+		}
 	}
 
 	//处理视频
@@ -215,9 +229,7 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				err = errors.New("AddCygxActivityVideo" + e.Error())
 				return
 			}
-			go UpdateActivityVideoResourceData(int(newId)) //写入首页最新  cygx_resource_data 表
-			//go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVIDEO, "add", activityInfo.ActivityTime) // 把活动视频的数据添加到 cygx_resource_data 表
-
+			go UpdateActivityVideoResourceData(int(newId))                               //写入首页最新  cygx_resource_data 表
 			go SendWxMsgWithUpdateActivityVideoAndVoice(activityId, itemVideo.VideoName) //  已结束的活动上传音频或视频后给已关注这个活动关联的产业的正式、试用 客户发送模板信息
 		} else {
 			e = cygx.UpdateCygxActivityVideo(itemVideo)
@@ -226,26 +238,7 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				return
 			}
 		}
-	}
-
-	//如果两个都为空，就判断之前是否上传过
-	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 UpdateActivityVoiceResourceData(voiceDetail.ActivityVoiceId) //写入首页最新  cygx_resource_data 表
-			//go UpdateResourceData(voiceDetail.ActivityVoiceId, utils.CYGX_OBJ_ACTIVITYVOICE, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动音频在 cygx_resource_data 表中删除
-		}
-
+	} else {
 		//删除原有的视频数据
 		videoDetail, e := cygx.GetCygxActivityVideoReqDetail(activityId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
@@ -258,27 +251,8 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 				err = errors.New("DeleteCygxActivityVideo" + e.Error())
 				return
 			}
-
 			go UpdateActivityVideoResourceData(videoDetail.VideoId) //写入首页最新  cygx_resource_data 表
-			//go UpdateResourceData(videoDetail.VideoId, utils.CYGX_OBJ_ACTIVITYVIDEO, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动视频在 cygx_resource_data 表中删除
 		}
 	}
 	return
 }
-
-//func init() {
-//	var conditionupload string
-//	var pars []interface{}
-//	listVideo, err := cygx.GetActivityVideoList(conditionupload, pars)
-//	if err != nil {
-//		fmt.Println(err)
-//	}
-//	for _, v := range listVideo {
-//		var newOssUrl string
-//		newOssUrl = strings.Replace(v.VideoUrl, "https://hzstatic.hzinsights.com", "https://hzchart.oss-accelerate.aliyuncs.com", -1)
-//		fmt.Println(newOssUrl)
-//		err = cygx.Updatevideo_url(newOssUrl, v.VideoId)
-//
-//		//return
-//	}
-//}