Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/search.go

@@ -597,6 +597,12 @@ func (this *SearchController) ListHomeArtAndChartPage() {
 	var result []*models.SearchItem
 	var total int64
 	if listType == 1 || listType == 2 {
+		//添加映射关系
+		keyWord = strings.ToUpper(keyWord)
+		keyWordDetail, _ := models.GetCygxCygxIkWordMapDetail(keyWord)
+		if keyWordDetail != nil {
+			keyWord = keyWordDetail.KeyWordMap
+		}
 		_, tmpTotal, err := services.EsArticleSearch(keyWord, startSize, pageSize, orderColumn, 0)
 		if err != nil {
 			br.Msg = "检索失败"

models/ik_word_map.go

@@ -0,0 +1,18 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+)
+
+type CygxIkWordMap struct {
+	KeyWord    string `description:"手机号"`
+	KeyWordMap string `description:"地区编码 国内默认为空"`
+}
+
+// 获取详情
+func GetCygxCygxIkWordMapDetail(keyWord string) (item *CygxIkWordMap, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_ik_word_map  WHERE key_word=?  `
+	err = o.Raw(sql, keyWord).QueryRow(&item)
+	return
+}

services/article.go

@@ -1414,7 +1414,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 			first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
 			keyword1 := "【" + articleInfo.SubCategoryName + "】有报告发布/更新"
 			mapActivityUserId := make(map[int]string)
-			if articleInfo.IsSummary == 1 {
+			if articleInfo.ReportType == 2 {
 				sliceSubjectId, _ := models.GetSubjectIds(articleId)
 				if sliceSubjectId != "" {
 					appointmentList, err := models.GetCygxAppointmentSummaryBySubjectId(sliceSubjectId)
@@ -1502,7 +1502,8 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 			first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
 			keyword1 := "【" + articleInfo.SubCategoryName + "】有报告发布/更新"
 			mapActivityUserId := make(map[int]string)
-			if articleInfo.IsSummary == 1 {
+			if articleInfo.ReportType == 2 {
+				keyword1 = fmt.Sprint("【", industryName, "】赛道有报告发布/更新")
 				sliceSubjectId, _ := models.GetSubjectIds(articleId)
 				if sliceSubjectId != "" {
 					appointmentList, err := models.GetCygxAppointmentSummaryBySubjectId(sliceSubjectId)
@@ -1524,8 +1525,8 @@ func DoArticleOnenIdWxTemplateMsg(articleId int) (err error) {
 							return err
 						}
 						for _, item := range openIdLists {
-							first := "您预约的调研，有关联的纪要发布/更新了"
-							keyword1 := industryName
+							//first := "您预约的调研，有关联的纪要发布/更新了"
+							//keyword1 := industryName
 							openIditem := new(models.OpenIdList)
 							openIditem.OpenId = item.OpenId
 							openIditem.UserId = item.UserId

services/wx_template_msg.go

@@ -278,7 +278,8 @@ func SendWxMsgWithArticleUserRemind(keyWord1, keyWord2 string, openIdList []*mod
 	}
 	var first string
 	first = keyWord1
-	keyword1 := keyWord2
+	//keyword1 := keyWord2
+	//keyword1 := keyWord2
 	remark := "点击查看报告详情"
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	templateId := utils.WxMsgTemplateIdArticleUserRemind
@@ -287,8 +288,8 @@ func SendWxMsgWithArticleUserRemind(keyWord1, keyWord2 string, openIdList []*mod
 	sendMap["template_id"] = templateId
 	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": utils.WX_MSG_PATH_ARTICLE_DETAIL + strconv.Itoa(articleId)}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["keyword2"] = map[string]interface{}{"value": "--", "color": "#173177"}
+	sendData["keyword1"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
 	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(articleId), utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)
@@ -315,8 +316,8 @@ func SendWxMsgWithActivityUserRemind(keyWord1, keyWord2 string, openIdList []*mo
 		return
 	}
 	var first string
-	first = keyWord1
-	keyword1 := keyWord2
+	//first = keyWord1
+	//keyword1 := keyWord2
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	templateId := utils.WxMsgTemplateIdArticleUserRemind
 	sendMap := make(map[string]interface{})
@@ -324,7 +325,8 @@ func SendWxMsgWithActivityUserRemind(keyWord1, keyWord2 string, openIdList []*mo
 	sendMap["template_id"] = templateId
 	sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxAppId, "pagepath": "activityPages/activityDetail/activityDetail?id=" + strconv.Itoa(activityId)}
 	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
+	sendData["keyword1"] = map[string]interface{}{"value": keyWord1, "color": "#173177"}
+	sendData["keyword2"] = map[string]interface{}{"value": keyWord2, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(activityId), utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD)
 	return