Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

# Conflicts:
#	services/activity.go

services/activity.go

@@ -2774,31 +2774,3 @@ func UpdateIsSendYidongSignUp(activityId int) (err error) {
 	err = models.UPdateSendedYiDongSignUp(activityId)
 	return
 }
-
-// 获取满足路演回放的活动类型
-func GetActivityLYHFMapByActivityIds(activityIds []int) (mapResp map[int]bool) {
-	var err error
-	defer func() {
-		if err != nil {
-			go utils.SendAlarmMsg("获取满足路演回放的活动类型 GetActivityLYHFMapByActivityIds，失败,活动ID："+fmt.Sprint(activityIds)+err.Error(), 2)
-		}
-	}()
-	var condition string
-	var pars []interface{}
-	lenArr := len(activityIds)
-	if lenArr == 0 {
-		return
-	}
-	condition = ` AND activity_id IN (` + utils.GetOrmInReplace(lenArr) + `)  `
-	pars = append(pars, activityIds)
-	list, e := models.GetCygxActivityList(condition, pars, 0, lenArr)
-	if e != nil {
-		err = errors.New("GetIndustrialManagementNewList, Err: " + e.Error())
-		return
-	}
-	mapResp = make(map[int]bool, 0)
-	for _, v := range list {
-		mapResp[v.ActivityId] = true
-	}
-	return
-}

services/micro_roadshow.go

@@ -1130,3 +1130,31 @@ func AddAllCygxVoiceAndVideoHistory(user *models.WxUserItem, sourceId, sourceTyp
 	}
 	return
 }
+
+// 获取满足路演回放的活动类型
+func GetActivityLYHFMapByActivityIds(activityIds []int) (mapResp map[int]bool) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("获取满足路演回放的活动类型 GetActivityLYHFMapByActivityIds，失败,活动ID："+fmt.Sprint(activityIds)+err.Error(), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	lenArr := len(activityIds)
+	if lenArr == 0 {
+		return
+	}
+	condition = ` AND activity_id IN (` + utils.GetOrmInReplace(lenArr) + `)  `
+	pars = append(pars, activityIds)
+	list, e := models.GetCygxActivityList(condition, pars, 0, lenArr)
+	if e != nil {
+		err = errors.New("GetIndustrialManagementNewList, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[int]bool, 0)
+	for _, v := range list {
+		mapResp[v.ActivityId] = true
+	}
+	return
+}