Merge branch 'cygx_7.3_yin_ping' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2722,6 +2722,7 @@ func (this *ActivityCoAntroller) LabelMoreList() {
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
 // @Param   ActivityTypeId   query   string  false     "活动类型id 多个用 , 隔开"
 // @Param   Source   query   int  false     "来源 0手机 ，1Pc 默认0"
+// @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
 // @Param   PlayBack   query   int  false       "是否仅展示回放 1：是、0：否 默认0"
 // @Param   KeyWord   query   string  false       "搜索关键词 多个用 , 隔开"
 // @Success 200 {object} models.GetCygxActivityListRep
@@ -2908,6 +2909,10 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 		resp.List = append(resp.List, services.ActivityButtonShow(v))
 	}
+	//添加活动搜索记录
+	if keyWord != "" {
+		go services.AddActivitykeyWordSearch(keyWord, user)
+	}
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true

services/activity.go

@@ -1408,3 +1408,25 @@ func GetActivityVoiceResp(mapActivityId []int) (mapItem map[int]*models.CygxActi
 	mapItem = mapActivityVoice
 	return
 }
+
+//AddActivitykeyWordSearch 添加活动搜索记录
+func AddActivitykeyWordSearch(keyWordSearch string, user *models.WxUserItem) {
+	if keyWordSearch != "" {
+		keyWordItem := new(models.CygxUserSearchKeyWord)
+		keyWordItem.UserId = user.UserId
+		keyWordItem.KeyWord = keyWordSearch
+		keyWordItem.PageType = "ActivitSearch"
+		keyWordItem.CreateTime = time.Now()
+		go models.AddUserSearchKeyWord(keyWordItem)
+
+		cacheKey := fmt.Sprint("Search_uid:", user.UserId, "_KeyWord:", keyWordSearch, "_Source:", 6)
+		isExist := utils.Rc.IsExist(cacheKey)
+		if !isExist {
+			setNX := utils.Rc.SetNX(cacheKey, keyWordSearch, time.Minute*1)
+			if !setNX {
+				go utils.SendAlarmMsg("记录用户搜索活动关键词失败，设置Redis Key 过期时间失败：key"+cacheKey, 3)
+			}
+			go AddUserSearchLog(user, keyWordSearch, 6)
+		}
+	}
+}