Merge branch 'cygx_10.9' into debug

models/company_interaction_num.go

@@ -22,18 +22,19 @@ type CygxCompanyInteractionNum struct {
 	ActivityVideoNum    int       `description:"活动视频播放量"`
 	ActivityVoiceNum    int       `description:"活动音频播放量"`
 	RoadshowNum         int       `description:"路演播放总数量"`
+	TagNum              int       `description:"标签点击次数"`
 	CreateTime          time.Time `description:"创建时间"`
 	ModifyTime          time.Time `description:"更新时间"`
 }
 
-//添加
+// 添加
 func AddCygxCompanyInteractionNum(item *CygxCompanyInteractionNum) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
-//修改
+// 修改
 func UpdateCygxCompanyInteractionNum(item *CygxCompanyInteractionNum) (err error) {
 	updateParams := make(map[string]interface{})
 	updateParams["CompanyId"] = item.CompanyId
@@ -51,6 +52,7 @@ func UpdateCygxCompanyInteractionNum(item *CygxCompanyInteractionNum) (err error
 	updateParams["ActivityVideoNum"] = item.ActivityVideoNum
 	updateParams["ActivityVoiceNum"] = item.ActivityVoiceNum
 	updateParams["RoadshowNum"] = item.RoadshowNum
+	updateParams["TagNum"] = item.TagNum
 	updateParams["CreateTime"] = time.Now()
 	updateParams["ModifyTime"] = time.Now()
 	whereParam := map[string]interface{}{"company_id": item.CompanyId}
@@ -58,7 +60,7 @@ func UpdateCygxCompanyInteractionNum(item *CygxCompanyInteractionNum) (err error
 	return
 }
 
-//获取列表
+// 获取列表
 func GetCygxCompanyInteractionNumList() (items []*CygxCompanyInteractionNum, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_company_interaction_num   `
@@ -66,7 +68,7 @@ func GetCygxCompanyInteractionNumList() (items []*CygxCompanyInteractionNum, err
 	return
 }
 
-//批量添加用户互动信息
+// 批量添加用户互动信息
 func AddCygxCompanyInteractionNumList(items []*CygxCompanyInteractionNum) (lastId int64, err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)

models/user_interaction_num.go

@@ -22,18 +22,19 @@ type CygxUserInteractionNum struct {
 	ActivityVideoNum    int       `description:"活动视频播放量"`
 	ActivityVoiceNum    int       `description:"活动音频播放量"`
 	RoadshowNum         int       `description:"路演播放总数量"`
+	TagNum              int       `description:"标签点击次数"`
 	CreateTime          time.Time `description:"创建时间"`
 	ModifyTime          time.Time `description:"更新时间"`
 }
 
-//添加
+// 添加
 func AddCygxUserInteractionNum(item *CygxUserInteractionNum) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
-//修改
+// 修改
 func UpdateCygxUserInteractionNum(item *CygxUserInteractionNum) (err error) {
 	updateParams := make(map[string]interface{})
 	updateParams["UserId"] = item.UserId
@@ -51,6 +52,7 @@ func UpdateCygxUserInteractionNum(item *CygxUserInteractionNum) (err error) {
 	updateParams["ActivityVideoNum"] = item.ActivityVideoNum
 	updateParams["ActivityVoiceNum"] = item.ActivityVoiceNum
 	updateParams["RoadshowNum"] = item.RoadshowNum
+	updateParams["TagNum"] = item.TagNum
 	updateParams["CreateTime"] = time.Now()
 	updateParams["ModifyTime"] = time.Now()
 	whereParam := map[string]interface{}{"user_id": item.UserId}
@@ -58,7 +60,7 @@ func UpdateCygxUserInteractionNum(item *CygxUserInteractionNum) (err error) {
 	return
 }
 
-//获取列表
+// 获取列表
 func GetCygxUserInteractionNumList() (items []*CygxUserInteractionNum, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_user_interaction_num   `
@@ -66,7 +68,7 @@ func GetCygxUserInteractionNumList() (items []*CygxUserInteractionNum, err error
 	return
 }
 
-//批量添加用户互动信息
+// 批量添加用户互动信息
 func AddCygxUserInteractionNumList(items []*CygxUserInteractionNum) (lastId int64, err error) {
 	o := orm.NewOrm()
 	_, err = o.InsertMulti(1, items)

models/wx_user.go

@@ -517,6 +517,7 @@ type CygxUserInteractionNumDetail struct {
 	RoadshowVideoNum    int    `description:"产业视频播放量"`
 	ActivityVideoNum    int    `description:"活动视频播放量"`
 	ActivityVoiceNum    int    `description:"活动音频播放量"`
+	TagNum              int    `description:"标签点击次数"`
 	PackageType         int    `description:"套餐类型，0：无，1：大套餐，2：小套餐"`
 	TryStage            int    `description:"试用客户子标签：0全部、1未分类、2 推进、3 跟踪、4 预备"`
 }
@@ -549,6 +550,7 @@ func GetCygxCompanyUserUserInteraction(userIds string) (items []*CygxUserInterac
 			WHERE
 				man.industrial_management_id IN ( SELECT industrial_management_id FROM cygx_industry_fllow AS f WHERE f.user_id = u.user_id  AND f.type = 1 ) 
 			) AS labels,
+			( SELECT COUNT( 1 ) FROM cygx_tag_history AS h WHERE h.user_id = u.user_id  ) AS tag_num,
 			(
 			SELECT
 				GROUP_CONCAT( DISTINCT man.label SEPARATOR ',' ) 

services/wx_user.go

@@ -537,7 +537,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 				//处理用户的互动量
 				if len(userUserInteractionList) > 0 {
 					for _, vsplit := range userUserInteractionList {
-						interactionNum = vsplit.HistoryNum + vsplit.CountNum + vsplit.IndustryFllowNum + vsplit.DepartmentFollowNum + vsplit.KeyWordNum + vsplit.OnLineNum + vsplit.OfficeNum + vsplit.ChartCountNum + vsplit.TripNum + vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
+						interactionNum = vsplit.HistoryNum + vsplit.CountNum + vsplit.IndustryFllowNum + vsplit.DepartmentFollowNum + vsplit.KeyWordNum + vsplit.OnLineNum + vsplit.OfficeNum + vsplit.ChartCountNum + vsplit.TripNum + vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum + vsplit.TagNum
 						if interactionNum > 0 {
 							//更改用户的互动量
 							err = models.UpdateUserInteractionNum(interactionNum, int(vsplit.UserId))
@@ -562,6 +562,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 							itemInteraction.RoadshowVideoNum = vsplit.RoadshowVideoNum
 							itemInteraction.ActivityVideoNum = vsplit.ActivityVideoNum
 							itemInteraction.ActivityVoiceNum = vsplit.ActivityVoiceNum
+							itemInteraction.TagNum = vsplit.TagNum
 							itemInteraction.RoadshowNum = vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
 							itemInteraction.CreateTime = time.Now()
 							itemInteraction.ModifyTime = time.Now()
@@ -583,6 +584,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 								itemCompanyInteraction.RoadshowVideoNum = vsplit.RoadshowVideoNum
 								itemCompanyInteraction.ActivityVideoNum = vsplit.ActivityVideoNum
 								itemCompanyInteraction.ActivityVoiceNum = vsplit.ActivityVoiceNum
+								itemCompanyInteraction.TagNum = vsplit.TagNum
 								itemCompanyInteraction.RoadshowNum = vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
 								mapCompanyInteractionItem[vsplit.CompanyId] = itemCompanyInteraction
 								mapCompanyInteractionItem[vsplit.CompanyId].CreateTime = time.Now()
@@ -603,6 +605,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 								mapCompanyInteractionItem[vsplit.CompanyId].RoadshowVideoNum += vsplit.RoadshowVideoNum
 								mapCompanyInteractionItem[vsplit.CompanyId].ActivityVideoNum += vsplit.ActivityVideoNum
 								mapCompanyInteractionItem[vsplit.CompanyId].ActivityVoiceNum += vsplit.ActivityVoiceNum
+								mapCompanyInteractionItem[vsplit.CompanyId].TagNum += vsplit.TagNum
 								mapCompanyInteractionItem[vsplit.CompanyId].RoadshowNum += vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
 
 							}
@@ -636,7 +639,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 			//处理用户的互动量
 			if len(userUserInteractionList) > 0 {
 				for _, vsplit := range userUserInteractionList {
-					interactionNum = vsplit.HistoryNum + vsplit.CountNum + vsplit.IndustryFllowNum + vsplit.DepartmentFollowNum + vsplit.KeyWordNum + vsplit.OnLineNum + vsplit.OfficeNum + vsplit.ChartCountNum + vsplit.TripNum + vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
+					interactionNum = vsplit.HistoryNum + vsplit.CountNum + vsplit.IndustryFllowNum + vsplit.DepartmentFollowNum + vsplit.KeyWordNum + vsplit.OnLineNum + vsplit.OfficeNum + vsplit.ChartCountNum + vsplit.TripNum + vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum + vsplit.TagNum
 					if interactionNum > 0 {
 						err = models.UpdateUserInteractionNum(interactionNum, int(vsplit.UserId))
 						if err != nil {
@@ -660,6 +663,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 						itemInteraction.RoadshowVideoNum = vsplit.RoadshowVideoNum
 						itemInteraction.ActivityVideoNum = vsplit.ActivityVideoNum
 						itemInteraction.ActivityVoiceNum = vsplit.ActivityVoiceNum
+						itemInteraction.TagNum = vsplit.TagNum
 						itemInteraction.RoadshowNum = vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
 
 						//如果这个切片下的结构体没有值就给他初始值，如果有就跟后面的相加
@@ -679,6 +683,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 							itemCompanyInteraction.RoadshowVideoNum = vsplit.RoadshowVideoNum
 							itemCompanyInteraction.ActivityVideoNum = vsplit.ActivityVideoNum
 							itemCompanyInteraction.ActivityVoiceNum = vsplit.ActivityVoiceNum
+							itemCompanyInteraction.TagNum = vsplit.TagNum
 							itemCompanyInteraction.RoadshowNum = vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
 							mapCompanyInteractionItem[vsplit.CompanyId] = itemCompanyInteraction
 							mapCompanyInteractionItem[vsplit.CompanyId].CreateTime = time.Now()
@@ -698,6 +703,7 @@ func UpdateWxUserLabel(cont context.Context) (err error) {
 							mapCompanyInteractionItem[vsplit.CompanyId].RoadshowVideoNum += vsplit.RoadshowVideoNum
 							mapCompanyInteractionItem[vsplit.CompanyId].ActivityVideoNum += vsplit.ActivityVideoNum
 							mapCompanyInteractionItem[vsplit.CompanyId].ActivityVoiceNum += vsplit.ActivityVoiceNum
+							mapCompanyInteractionItem[vsplit.CompanyId].TagNum += vsplit.TagNum
 							mapCompanyInteractionItem[vsplit.CompanyId].RoadshowNum += vsplit.RoadshowVideoNum + vsplit.ActivityVideoNum + vsplit.ActivityVoiceNum
 						}