Merge branch 'cygx_9.3' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -4643,7 +4643,6 @@ func (this *ActivityCoAntroller) ActivityVideoHistoryAdd() {
 		return
 	}
 
-	go services.ActivityVideoUserRmind(user, activityId, 1)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

services/activity.go

@@ -1736,21 +1736,32 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return
 		}
-		activityInfo, e := models.GetAddActivityInfoById(activityId)
-		if e != nil {
-			err = errors.New("GetCygxActivitySpecialDetailById, Err: " + e.Error())
-			return
-		}
-		if activityInfo == nil {
-			return
-		}
+
 		//TripStatus            int    `description:"行程进行状态 1：预报名，2：确定行程"`
 		if fileType == 1 {
+			activityInfo, e := models.GetCygxActivityVideoByActivityId(activityId)
+			if e != nil {
+				err = errors.New("GetCygxActivitySpecialDetailById, Err: " + e.Error())
+				return
+			}
+			if activityInfo == nil {
+				return
+			}
+			keyword1 = activityInfo.VideoName
 			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放视频")
 		} else {
+			activityInfo, e := models.GetCygxActivityVoiceByActivityId(activityId)
+			if e != nil {
+				err = errors.New("GetCygxActivitySpecialDetailById, Err: " + e.Error())
+				return
+			}
+			if activityInfo == nil {
+				return
+			}
+			keyword1 = activityInfo.VoiceName
 			first = fmt.Sprint(user.RealName, "--", user.CompanyName, ",有新的互动：播放音频")
 		}
-		keyword1 = activityInfo.ActivityName
+
 		keyword2 = "__"
 		remark = "点击查看活动详情"
 		openIdArr := make([]string, 0)

services/cygx_activity_video_history.go

@@ -40,6 +40,6 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId int) (err error
 	if err != nil {
 		return
 	}
-
+	go ActivityVideoUserRmind(user, activityId, 1)
 	return
 }