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

controllers/report_selection.go

@@ -302,10 +302,15 @@ func (this *ReportSelectionController) AddStopTime() {
 	outType := req.OutType
 	source := req.Source
 	var reportType string
+	var tableName, label string
 	if source == 1 {
 		reportType = "bgjx"
+		tableName = "cygx_report_selection"
+		label = "本周研究汇总"
 	} else if source == 2 {
 		reportType = "bzyjhz"
+		tableName = "cygx_research_summary"
+		label = "本周研究汇总"
 	} else if source == 3 {
 		reportType = "szjyhz"
 	}
@@ -339,6 +344,9 @@ func (this *ReportSelectionController) AddStopTime() {
 			historyRecord.SellerName = sellerItem.RealName
 		}
 		go services.AddCygxReportHistoryRecord(historyRecord)
+		if tableName != "" {
+			go services.ReportSelectionWxUserRaiLabelRedisAdd(articleId, uid, historyRecord.CreateTime, tableName, label)
+		}
 	}
 
 	br.Ret = 200

models/report_selection_log.go

@@ -6,19 +6,22 @@ import (
 )
 
 type CygxReportSelectionLog struct {
-	ArticleSunId           int       `description:"子级报告id"`
-	ArticleId              int       `description:"父级报告Id"`
-	ChartPermissionId      int       `description:"行业ID"`
-	PermissionName         string    `description:"行业ID"`
-	CreateTime             time.Time `description:"创建时间"`
-	Body                   string    `description:"内容"`
-	IndustrialSubjectId    int       `description:"标的ID"`
-	IndustrialManagementId string    `description:"产业资源包Id  多个用 , 隔开"`
-	SubjectName            string    `description:"标的名称"`
-	IcoLink                string    `orm:"column(image_url)"description:"图标链接"`
-	CompanyLabel           []string  `description:"公司标签"`
-	Label                  string    `description:"公司标签"`
-	OverviewArticleId      int       `description:"综述报告Id"`
+	ArticleSunId              int       `description:"子级报告id"`
+	ArticleId                 int       `description:"父级报告Id"`
+	ChartPermissionId         int       `description:"行业ID"`
+	PermissionName            string    `description:"行业ID"`
+	CreateTime                time.Time `description:"创建时间"`
+	Body                      string    `description:"内容"`
+	IndustrialSubjectId       int       `description:"标的ID"`
+	IndustrialManagementId    string    `description:"产业资源包Id  多个用 , 隔开"`
+	IndustrialManagementNames string    `description:"产业资源包名称  多个用 , 隔开"`
+	SubjectName               string    `description:"标的名称"`
+	IcoLink                   string    `orm:"column(image_url)"description:"图标链接"`
+	CompanyLabel              []string  `description:"公司标签"`
+	Label                     string    `description:"公司标签"`
+	OverviewArticleId         int       `description:"综述报告Id"`
+	ThirdId                   int       `description:"类似产业、标的的三方ID"`
+	ThirdName                 string    `description:"类似产业、标的的三方名称"`
 }
 
 type CygxReportSelectionLogResp struct {

services/report_selection.go

@@ -68,3 +68,37 @@ func SendCygxReportSelectionLogApplyTemplateMsg(user *models.WxUserItem, content
 	err = PublicSendTemplateMsg(sendInfo)
 	return
 }
+
+// 记录用户在重点公司单独点了某一个标签
+func GetReportSelectionLabelName(req models.AddCygxReportSelectionSubjectHistoryReq, userId int) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("SendCygxReportSelectionLogApplyTemplateMsg Err"+err.Error(), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	condition = ` AND article_id = ?  AND industrial_subject_id = ? AND  industrial_management_id = ? AND  third_id = ? `
+	pars = append(pars, req.ArticleId, req.IndustrialSubjectId, req.IndustrialManagementId, req.ThirdId)
+	listLog, e := models.GetCygxReportSelectionLog(condition, pars, 0, 9999)
+	if e != nil {
+		err = errors.New("GetCygxReportSelectionLog, Err: " + e.Error())
+		return
+	}
+	var labelName string
+	for _, v2 := range listLog {
+		if v2.ThirdId > 0 {
+			labelName = v2.ThirdName
+		} else if v2.IndustrialSubjectId == 0 && v2.IndustrialManagementId != "" {
+			labelName = v2.IndustrialManagementNames
+		} else {
+			labelName = v2.SubjectName
+		}
+	}
+	if labelName == "" {
+		return
+	}
+	ReportSelectionWxUserRaiLabelRedisAdd(req.ArticleId, userId, time.Now(), "cygx_report_selection", labelName)
+	return
+}

services/wx_user_rai_label.go

@@ -48,6 +48,25 @@ func ArticleWxUserRaiLabelRedisAdd(sourceId, uid int, createTime time.Time) (err
 	return
 }
 
+// 添加用户阅读本周研究汇总，与重点公司标签到Redis
+func ReportSelectionWxUserRaiLabelRedisAdd(sourceId, uid int, createTime time.Time, tableName, 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, TableName: tableName, Label: label, 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("ReportSelectionWxUserRaiLabelRedisAdd LPush Err:" + err.Error())
+		}
+	}
+	return
+}
+
 func UpdateWxUserRaiLabelRedis() (err error) {
 	for {
 		//	SourceType       int       `description:"来源1:搜索关键字标签、2:产业/个股标签(线下活动)、3:产业/个股标签(线下路演)、4:产业/个股标签(线上活动)、5:产业/个股标签(线上路演)、6:销售输入标签、7:产业/个股标签(报告)、8:报告类型标签"`
@@ -89,6 +108,13 @@ func UpdateWxUserRaiLabelRedis() (err error) {
 				case utils.CYGX_OBJ_ARTICLE:
 					go ArticleWxUserRaiLabelRedisAddReduce(log)
 					fmt.Println("阅读文章")
+				case "cygx_research_summary":
+					go ReportSelectionWxUserRaiLabelRedisAddReduce(log)
+					fmt.Println("阅读本周研究汇总")
+				case "cygx_report_selection":
+					go ReportSelectionWxUserRaiLabelRedisAddReduce(log)
+					fmt.Println("阅读报告精选（重点公司）")
+
 				}
 			}
 
@@ -282,3 +308,42 @@ func ArticleWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err er
 
 	return
 }
+
+// 8:报告类型标签 (本周研究汇总，与重点公司)
+func ReportSelectionWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("报告类型标签 (本周研究汇总，与重点公司)，处理Redis队列消息失败：ReportSelectionWxUserRaiLabelRedisAddReduce"+err.Error()+fmt.Sprint("SourceId", log.SourceId, "userId", log.UserId), 2)
+		}
+	}()
+	userId := log.UserId
+	sourceId := log.SourceId
+	wxUser, e := models.GetWxUserItemByUserId(userId)
+	if e != nil {
+		err = errors.New("GetWxUserItemByUserId" + e.Error())
+		return
+	}
+
+	item := new(models.WxUserRaiLabel)
+	item.UserId = wxUser.UserId
+	item.RealName = wxUser.RealName
+	item.Mobile = wxUser.Mobile
+	item.Email = wxUser.Email
+	item.CompanyId = wxUser.CompanyId
+	item.CompanyName = wxUser.CompanyName
+	item.Label = log.Label
+	item.SourceType = 8
+	item.SourceId = sourceId
+	item.CreateTime = log.CreateTime
+	item.ModifyTime = time.Now()
+	item.RegisterPlatform = log.RegisterPlatform
+	item.TableName = log.TableName
+	err = models.AddWxUserRaiLabel(item)
+	if e != nil {
+		err = errors.New("AddWxUserRaiLabel" + e.Error())
+		return
+	}
+
+	return
+}