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

models/wx_user_rai_label.go

@@ -0,0 +1,13 @@
+package models
+
+import "time"
+
+type WxUserRaiLabelRedis struct {
+	UserId           int       `description:"用户ID"`
+	SourceId         int       `description:"资源ID"`
+	Label            string    `description:"标签内容"`
+	SourceType       int       `description:"来源1:搜索关键字标签、2:产业/个股标签(线下活动)、3:产业/个股标签(线下路演)、4:产业/个股标签(线上活动)、5:产业/个股标签(线上路演)、6:销售输入标签、7:产业/个股标签(报告)、8:报告类型标签"`
+	CreateTime       time.Time `description:"创建时间"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
+	TableName        string    `description:"数据来源的表名"`
+}

services/article_history.go

@@ -89,6 +89,7 @@ func ArticleHistoryStopTime(articleId, stopTime, outType int, user *models.WxUse
 		recordRedis.OutId = int(newId)
 		recordRedis.CreateTime = record.CreateTime
 		go PushViewRecordNewRedisData(recordRedis, user.CompanyId)
+		go ArticleWxUserRaiLabelRedisAdd(articleId, user.UserId, record.CreateTime)
 		utils.Rc.Put(key, 1, 2*time.Second)
 	}
 	go ArticleHistoryUserLabelLogAdd(articleId, uid)

services/keyword.go

@@ -36,6 +36,7 @@ func AddSearchKeyWord(user *models.WxUserItem, keyWord string, source int) (err
 	go AddUserSearchLog(user, keyWord, source)
 	go SearchKeywordUserRmind(user, keyWord)
 	go SearchKeywordUserRmindCategoryMsg(user, keyWord)
+	go KeyWordsWxUserRaiLabelRedisAdd(0, user.UserId, keyWord)
 	//一分钟之内的相同搜索词不重复记录
 	//setNX := utils.Rc.SetNX(cacheKey, keyWord, time.Second*3)
 	//if !setNX {

services/wx_user_rai_label.go

@@ -0,0 +1,46 @@
+package services
+
+import (
+	"fmt"
+	"hongze/hongze_web_mfyx/models"
+	"hongze/hongze_web_mfyx/utils"
+	"time"
+)
+
+// 添加用户搜索标签到Redis
+func KeyWordsWxUserRaiLabelRedisAdd(sourceId, uid int, label string) (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: 1, Label: label, CreateTime: time.Now(), RegisterPlatform: utils.REGISTER_PLATFORM}
+	if utils.Re == nil {
+		err := utils.Rc.LPush(utils.WX_USER_RAI_LABEL_KEY, log)
+		if err != nil {
+			fmt.Println("WxUserRaiLabelRedis LPush Err:" + err.Error())
+		}
+	}
+	return
+}
+
+// 添加用户阅读文章标签到Redis
+func ArticleWxUserRaiLabelRedisAdd(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: 1, TableName: utils.CYGX_OBJ_ARTICLE, 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("WxUserRaiLabelRedis LPush Err:" + err.Error())
+		}
+	}
+	return
+}

utils/constants.go

@@ -150,8 +150,9 @@ const (
 )
 const (
 	YD_TOKEN                = "yidong_token"
-	CYGX_USER_KEY_LABEL     = "CYGX_USER_KEY_LABEL"     //查研观向用户标签
-	CYGX_YANXUAN_POINTS_KEY = "CYGX_YANXUAN_POINTS_KEY" //查研观向研选活动扣点KEY
+	CYGX_USER_KEY_LABEL     = "CYGX_USER_KEY_LABEL"        //查研观向用户标签
+	CYGX_YANXUAN_POINTS_KEY = "CYGX_YANXUAN_POINTS_KEY"    //查研观向研选活动扣点KEY
+	WX_USER_RAI_LABEL_KEY   = "CYGX_WX_USER_RAI_LABEL_KEY" //用户列表标签key
 )
 
 // 邀请机构标识