Merge branch 'hotfix/road_video_ths' into debug

models/chart_permission.go

@@ -76,3 +76,18 @@ func GetYbChartPermissionFirstByName(classifyName string) (item *YbChartPermissi
 	err = o.Raw(sql, classifyName).QueryRow(&item)
 	return
 }
+
+// GetChartPermissionByIds 主键获取权限
+func GetChartPermissionByIds(permissionIds []string) (list []*ChartPermission, err error) {
+	qb, _ := orm.NewQueryBuilder("mysql")
+	// 构建查询对象
+	qb.Select("*").From("chart_permission").
+		Where("chart_permission_id").In(permissionIds...)
+	// 导出 SQL 语句
+	sql := qb.String()
+
+	// 执行 SQL 语句
+	o := orm.NewOrm()
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}

models/yb/Road_video.go

@@ -7,19 +7,20 @@ import (
 
 // RoadVideo 路演视频
 type RoadVideo struct {
-	RoadVideoId int       `orm:"column(road_video_id);pk" description:"视频ID"`
-	Title            string    `description:"视频标题"`
-	CoverImgUrl      string    `description:"封面图地址"`
-	VideoUrl         string    `description:"视频地址"`
-	VideoSeconds     string    `description:"视频时长，单位秒"`
-	PublishState     int       `description:"发布状态：0-待发布 1-已发布"`
-	SendThsState     int       `description:"客群消息推送状态：0-待推送 1-已推送"`
-	IsDeleted        int       `description:"是否已删除 0-否 1-是"`
-	PublishTime      time.Time `description:"发布时间"`
-	SendThsTime      time.Time `description:"推送客群时间"`
-	CreateTime       time.Time `description:"提问时间"`
-	ModifyTime       time.Time `description:"修改时间"`
-	DeleteTime       time.Time `description:"删除时间"`
+	RoadVideoId        int       `orm:"column(road_video_id);pk" description:"视频ID"`
+	Title              string    `description:"视频标题"`
+	CoverImgUrl        string    `description:"封面图地址"`
+	VideoUrl           string    `description:"视频地址"`
+	VideoSeconds       string    `description:"视频时长，单位秒"`
+	PublishState       int       `description:"发布状态：0-待发布 1-已发布"`
+	ChartPermissionIds string    `description:"品种权限ID,用英文逗号分隔"`
+	SendThsState       int       `description:"客群消息推送状态：0-待推送 1-已推送"`
+	IsDeleted          int       `description:"是否已删除 0-否 1-是"`
+	PublishTime        time.Time `description:"发布时间"`
+	SendThsTime        time.Time `description:"推送客群时间"`
+	CreateTime         time.Time `description:"提问时间"`
+	ModifyTime         time.Time `description:"修改时间"`
+	DeleteTime         time.Time `description:"删除时间"`
 }
 
 func (item *RoadVideo) TableName() string {

services/report_push.go

@@ -555,7 +555,30 @@ func SendYbRoadVideoToThs(videoId int) (err error) {
 		err = errors.New("获取视频信息失败, Err:" + e.Error())
 		return
 	}
-	permissionName := "宏观" // 所有客群都推
+	chartPermissionIds := video.ChartPermissionIds
+	// 标签信息
+	if chartPermissionIds == "" {
+		return
+	}
+	chartPermissionIdSlice := strings.Split(chartPermissionIds, ",")
+	chartList, e := models.GetChartPermissionByIds(chartPermissionIdSlice)
+	if e != nil {
+		err = errors.New("获取品种信息失败, Err:" + e.Error())
+		return
+	}
+	permissionName := ""
+	for _, v := range chartList {
+		if v.PermissionName == "宏观经济" {
+			v.PermissionName = "宏观"
+		}
+		permissionName += v.PermissionName+","
+	}
+	if permissionName == "" {
+		err = errors.New("客群标签为空, 不可推送")
+		return
+	}
+	permissionName = strings.Trim(permissionName, ",")
+	//permissionName := "宏观" //写死宏观，默认所有群都推
 	title := video.Title
 	jumpUrl := fmt.Sprint(utils.WxYbAppId+`/pages/roadShow/video/list?videoId=`, videoId)
 	logoUrl := `https://hongze.oss-cn-shanghai.aliyuncs.com/hzyj.png`