zhangchuanxing преди 1 месец
родител
ревизия
f904e51be1
променени са 3 файла, в които са добавени 80 реда и са изтрити 5 реда
  1. 1 1
      models/activity.go
  2. 1 1
      models/industrial_activity_group_subject.go
  3. 78 3
      services/wx_user_rai_label.go

+ 1 - 1
models/activity.go

@@ -288,7 +288,7 @@ func GetAddActivityInfoByActivityId(ActivityId int) (item *ActivityDetail, err e
 // 获取活动详情
 func GetAddActivityDetailByActivityId(ActivityId int) (item *ActivityDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT a.*,t.activity_type, FROM cygx_activity AS a 
+	sql := `SELECT a.*,t.activity_type FROM cygx_activity AS a 
 			INNER JOIN cygx_activity_type  as t ON t.activity_type_id = a.activity_type_id  WHERE activity_id=?  `
 	err = o.Raw(sql, ActivityId).QueryRow(&item)
 	return

+ 1 - 1
models/industrial_activity_group_subject.go

@@ -42,7 +42,7 @@ func GetSubjectActivityGroupManagementListByActivityId(activityId int) (items []
 			cygx_industrial_subject  AS s
 			INNER JOIN cygx_industrial_activity_group_subject AS ag ON s.industrial_subject_id = ag.industrial_subject_id 
 			WHERE
-			ag.activity_id = ?`
+			ag.activity_id = ?  AND   ag.source = 1  `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }

+ 78 - 3
services/wx_user_rai_label.go

@@ -106,7 +106,10 @@ func UpdateWxUserRaiLabelRedis() (err error) {
 					go ActivityWxUserRaiLabelRedisAddReduce(log)
 					fmt.Println("活动到会")
 					break
-
+				case 3, 5:
+					go RoadshowWxUserRaiLabelRedisAddReduce(log)
+					fmt.Println("活动到会")
+					break
 				default:
 					fmt.Println(string(b))
 					go utils.SendAlarmMsg("用户更新相关标签处理Redis队列消息失败:"+string(b), 2)
@@ -168,6 +171,11 @@ func KeyWordsWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err e
 	return
 }
 
+func init() {
+	log := models.WxUserRaiLabelRedis{UserId: 53840, SourceId: 1753, SourceType: 3, TableName: "", Label: "", CreateTime: time.Now(), RegisterPlatform: utils.REGISTER_PLATFORM}
+	ActivityWxUserRaiLabelRedisAddReduce(log)
+}
+
 // 2:产业/个股标签(线下活动)、 4:产业/个股标签(线上活动)
 // 用户参加活动,相关标签
 func ActivityWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err error) {
@@ -227,12 +235,12 @@ func ActivityWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err e
 	}
 
 	//建立首页资源表,与标的 的关系
-	subjectList, e := models.GetSubjectArticleGroupManagementListByArtcileId(sourceId)
+	subjectList, e := models.GetSubjectActivityGroupManagementListByActivityId(sourceId)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetSubjectArticleGroupManagementListByArtcileId, Err: " + e.Error() + "sourceId:" + strconv.Itoa(sourceId))
 		return
 	}
-
+	//fmt.Println("subjectList", subjectList)
 	for _, v := range subjectList {
 		item := new(models.WxUserRaiLabel)
 		item.UserId = wxUser.UserId
@@ -281,6 +289,73 @@ func ActivityWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err e
 	return
 }
 
+// 3:产业/个股标签(路演线下活动)、 5:产业/个股标签(路演线上活动)
+// 用户参加路演,相关标签
+func RoadshowWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("用户参加路演,相关标签,处理Redis队列消息失败:RoadshowWxUserRaiLabelRedisAddReduce"+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
+	}
+	activityDetail, e := models.GetAddActivityDetailByActivityId(sourceId)
+	if e != nil {
+		err = errors.New("GetArticleDetailTestById" + e.Error())
+		return
+	}
+
+	var sourceType int
+	if activityDetail.ActivityType == 1 {
+		sourceType = 4
+	} else {
+		sourceType = 2
+	}
+
+	//正常的有产业报告
+	var labelArr []string
+	//建立首页资源表,与产业的关系
+	industrialList, e := models.GetIndustrialActivityGroupManagementListByArticleId(sourceId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetIndustrialArticleGroupManagementListByArticleId, Err: " + e.Error() + "sourceId:" + strconv.Itoa(sourceId))
+		return
+	}
+
+	var items []*models.WxUserRaiLabel
+	for _, v := range industrialList {
+		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 = v.IndustryName
+		item.SourceType = sourceType
+		item.SourceId = sourceId
+		item.CreateTime = log.CreateTime
+		item.ModifyTime = time.Now()
+		item.RegisterPlatform = log.RegisterPlatform
+		item.TableName = ""
+		items = append(items, item)
+		labelArr = append(labelArr, v.IndustryName)
+	}
+
+	e = models.AddWxUserRaiLabelMulti(items, labelArr, userId)
+	if e != nil {
+		err = errors.New("AddWxUserRaiLabelMulti" + e.Error())
+		return
+	}
+
+	return
+}
+
 // 7:产业/个股标签(报告)、8:报告类型标签
 func ArticleWxUserRaiLabelRedisAddReduce(log models.WxUserRaiLabelRedis) (err error) {
 	defer func() {