Merge branch 'crm/crm_16.5' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

models/home.go

@@ -85,8 +85,9 @@ type ArticleListResp struct {
 	SpecialColumnId     int      `description:"专栏栏目id"`
 	SpecialType         int      `description:"专栏类型 1:笔记，2:观点"`
 	List                []*IndustrialManagementIdInt
-	TopTime             int `description:"置顶时间"`
-	ReportId            int `description:"FICC研报ID"`
+	TopTime             int    `description:"置顶时间"`
+	ReportId            int    `description:"FICC研报ID"`
+	SubCategoryName     string `description:"二级分类"`
 }
 
 type HomeChartListResp struct {

models/report.go

@@ -1302,6 +1302,7 @@ func GetReportAndproductIndustrylListimgZhouqi(condition string, startSize, page
 			art.category_id,
 			art.title,
 			art.publish_date,
+			art.sub_category_name,
 			1 AS resource 
 		FROM
 			cygx_article AS art 

services/article.go

@@ -229,6 +229,10 @@ func HandleArticleCategoryImg(list []*models.ArticleListResp, user *models.WxUse
 			v.IsCollect = articleCollectYanxuanSpecialMap[v.ArticleId]
 			v.Pv = yanxuanSpecialPv[v.ArticleId]
 		}
+
+		if v.SubCategoryName == "宏观G2观察" {
+			list[k].Title = "【宏观G2观察】" + v.Title
+		}
 	}
 
 	if len(list) == 0 {

services/cygx_activity_video_history.go

@@ -102,6 +102,7 @@ func AddActivityVideoHistory(user *models.WxUserItem, activityId, playSeconds in
 	}
 	//设置消息提醒
 	go ActivityVideoUserRmind(user, activityId, 1)
+	go ActivityVivoWxUserRaiLabelRedisAdd(activityId, user.UserId, item.CreateTime) // 添加用户播放活动音视频标签到Redis
 	return
 }
 
@@ -152,5 +153,6 @@ func AddActivityVoiceHistory(user *models.WxUserItem, activityId, playSeconds in
 	}
 	//设置消息提醒
 	go ActivityVideoUserRmind(user, activityId, 2)
+	go ActivityVivoWxUserRaiLabelRedisAdd(activityId, user.UserId, item.CreateTime) // 添加用户播放活动音视频标签到Redis
 	return
 }

services/wx_user_rai_label.go

@@ -63,3 +63,22 @@ func ReportSelectionWxUserRaiLabelRedisAdd(sourceId, uid int, createTime time.Ti
 	}
 	return
 }
+
+// 添加用户播放活动音视频标签到Redis  9
+func ActivityVivoWxUserRaiLabelRedisAdd(sourceId, uid int, createTime time.Time) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			msg := fmt.Sprint("sourceId:", sourceId, "userId:", uid)
+			go utils.SendAlarmMsg("添加用户参加活动标签，写入Redis队列消息失败："+err.Error()+msg, 2)
+		}
+	}()
+	log := &models.WxUserRaiLabelRedis{UserId: uid, SourceId: sourceId, SourceType: 9, CreateTime: createTime, RegisterPlatform: utils.REGISTER_PLATFORM}
+	if utils.Re == nil {
+		err := utils.Rc.LPush(utils.WX_USER_RAI_LABEL_KEY, log)
+		if err != nil {
+			fmt.Println("ActivityWxUserRaiLabelRedisAdd LPush Err:" + err.Error())
+		}
+	}
+	return
+}