Merge branch 'cygx/cygx_activity_video——voice' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

# Conflicts:
#	services/cygx/acitvity.go

services/cygx/acitvity.go

@@ -1474,86 +1474,3 @@ func CheckActivityUpdatePower(adminId int, activityInfo *cygx.ActivityDetail) (h
 	havePower = true
 	return
 }
-
-func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *cygx.CygxActivityVoice, itemVideo *cygx.CygxActivityVideo) (err error) {
-	if activityInfo.ActiveState != 3 {
-		return // 没有结束的活动不会上传音视频
-	}
-	activityId := activityInfo.ActivityId
-	var condition string
-	var pars []interface{}
-	//处理音频
-	if itemVoice != nil {
-		condition = " AND activity_id = ? "
-		pars = append(pars, activityId)
-		total, e := cygx.GetCygxActivityVoiceCount(condition, pars)
-		if e != nil {
-			err = errors.New("GetCygxActivityVoiceCount" + e.Error())
-			return
-		}
-		//如果大于0就新增，反之就修改
-		if total > 0 {
-			newId, e := cygx.AddCygxActivityVoice(itemVoice)
-			if e != nil {
-				err = errors.New("GetCygxActivityVoiceCount" + e.Error())
-				return
-			}
-			go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVOICE, "add", activityInfo.ActivityTime) // 把活动音频的数据添加到 cygx_resource_data 表
-		} else {
-			e = cygx.UpdateCygxActivityVoice(itemVoice)
-			if e != nil {
-				err = errors.New("UpdateCygxActivityVoice" + e.Error())
-				return
-			}
-		}
-	}
-
-	//处理视频
-	if itemVideo != nil {
-		condition = " AND art.activity_id = ? "
-		pars = append(pars, activityId)
-		total, e := cygx.GetActivityVideoCount(condition, pars)
-		if e != nil {
-			err = errors.New("GetActivityVideoCount" + e.Error())
-			return
-		}
-		//如果大于0就新增，反之就修改
-		if total > 0 {
-			newId, e := cygx.AddCygxActivityVideo(itemVideo)
-			if e != nil {
-				err = errors.New("AddCygxActivityVideo" + e.Error())
-				return
-			}
-			go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVIDEO, "add", activityInfo.ActivityTime) // 把活动视频的数据添加到 cygx_resource_data 表
-		} else {
-			e = cygx.UpdateCygxActivityVideo(itemVideo)
-			if e != nil {
-				err = errors.New("UpdateCygxActivityVideo" + e.Error())
-				return
-			}
-		}
-	}
-
-	//如果两个都为空，就判断之前是否上传过
-	if itemVoice == nil && itemVideo == nil {
-		voiceDetail, e := cygx.GetCygxActivityVoiceReqDetail(activityId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
-			return
-		}
-		if voiceDetail != nil {
-			go UpdateResourceData(voiceDetail.ActivityVoiceId, utils.CYGX_OBJ_ACTIVITYVOICE, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动音频在 cygx_resource_data 表中删除
-		}
-
-		//删除原有的视频数据
-		videoDetail, e := cygx.GetCygxActivityVideoReqDetail(activityId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetCygxActivityVideoReqDetail" + e.Error())
-			return
-		}
-		if videoDetail != nil {
-			go UpdateResourceData(videoDetail.VideoId, utils.CYGX_OBJ_ACTIVITYVIDEO, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动视频在 cygx_resource_data 表中删除
-		}
-	}
-	return
-}

services/cygx/activity_ocr.go

@@ -155,3 +155,87 @@ func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.Activ
 	req.PointsSet = pointsSet
 	return
 }
+
+// 代码冲突了先放这里
+func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *cygx.CygxActivityVoice, itemVideo *cygx.CygxActivityVideo) (err error) {
+	if activityInfo.ActiveState != 3 {
+		return // 没有结束的活动不会上传音视频
+	}
+	activityId := activityInfo.ActivityId
+	var condition string
+	var pars []interface{}
+	//处理音频
+	if itemVoice != nil {
+		condition = " AND activity_id = ? "
+		pars = append(pars, activityId)
+		total, e := cygx.GetCygxActivityVoiceCount(condition, pars)
+		if e != nil {
+			err = errors.New("GetCygxActivityVoiceCount" + e.Error())
+			return
+		}
+		//如果大于0就新增，反之就修改
+		if total > 0 {
+			newId, e := cygx.AddCygxActivityVoice(itemVoice)
+			if e != nil {
+				err = errors.New("GetCygxActivityVoiceCount" + e.Error())
+				return
+			}
+			go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVOICE, "add", activityInfo.ActivityTime) // 把活动音频的数据添加到 cygx_resource_data 表
+		} else {
+			e = cygx.UpdateCygxActivityVoice(itemVoice)
+			if e != nil {
+				err = errors.New("UpdateCygxActivityVoice" + e.Error())
+				return
+			}
+		}
+	}
+
+	//处理视频
+	if itemVideo != nil {
+		condition = " AND art.activity_id = ? "
+		pars = append(pars, activityId)
+		total, e := cygx.GetActivityVideoCount(condition, pars)
+		if e != nil {
+			err = errors.New("GetActivityVideoCount" + e.Error())
+			return
+		}
+		//如果大于0就新增，反之就修改
+		if total > 0 {
+			newId, e := cygx.AddCygxActivityVideo(itemVideo)
+			if e != nil {
+				err = errors.New("AddCygxActivityVideo" + e.Error())
+				return
+			}
+			go UpdateResourceData(int(newId), utils.CYGX_OBJ_ACTIVITYVIDEO, "add", activityInfo.ActivityTime) // 把活动视频的数据添加到 cygx_resource_data 表
+		} else {
+			e = cygx.UpdateCygxActivityVideo(itemVideo)
+			if e != nil {
+				err = errors.New("UpdateCygxActivityVideo" + e.Error())
+				return
+			}
+		}
+	}
+
+	//如果两个都为空，就判断之前是否上传过
+	if itemVoice == nil && itemVideo == nil {
+		voiceDetail, e := cygx.GetCygxActivityVoiceReqDetail(activityId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetCygxActivityVoiceReqDetail" + e.Error())
+			return
+		}
+		if voiceDetail != nil {
+			go UpdateResourceData(voiceDetail.ActivityVoiceId, utils.CYGX_OBJ_ACTIVITYVOICE, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动音频在 cygx_resource_data 表中删除
+		}
+
+		//删除原有的视频数据
+		videoDetail, e := cygx.GetCygxActivityVideoReqDetail(activityId)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetCygxActivityVideoReqDetail" + e.Error())
+			return
+		}
+		if videoDetail != nil {
+			go UpdateResourceData(videoDetail.VideoId, utils.CYGX_OBJ_ACTIVITYVIDEO, "delete", time.Now().Format(utils.FormatDateTime)) // 把活动视频在 cygx_resource_data 表中删除
+		}
+	}
+	return
+}