Pārlūkot izejas kodu

Merge branch 'yx_1.1' into debug

zwxi 1 gadu atpakaļ
vecāks
revīzija
6f430f41fb
1 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 5 3
      services/wx_category_template_msg.go

+ 5 - 3
services/wx_category_template_msg.go

@@ -76,6 +76,7 @@ func SendWxCategoryMsgWithActivityUserRemind(keyWord1, keyWord2, keyWord3, keyWo
 			utils.FileLog.Info("发送模版消息失败,Err:%s", err.Error())
 		}
 	}()
+	keyWord1 = utils.TruncateActivityNameString(keyWord1)
 	accessToken, err := models.GetWxAccessTokenByXzs()
 	if err != nil {
 		msg = "GetWxAccessToken Err:" + err.Error()
@@ -90,11 +91,11 @@ func SendWxCategoryMsgWithActivityUserRemind(keyWord1, keyWord2, keyWord3, keyWo
 		openIdArr = append(openIdArr, v.OpenId)
 	}
 	var keywords []string
-	keywords = append(keywords, keyWord1, keyWord2)
+	keywords = append(keywords, keyWord1, keyWord2, keyWord3, keyWord4)
 
 	sendInfo := new(SendWxCategoryTemplate)
 	sendInfo.Keywords = keywords
-	sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdArticleUserRemind
+	sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
 	sendInfo.RedirectTarget = 3
 	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
 	sendInfo.OpenIdArr = openIdArr
@@ -687,6 +688,7 @@ func SendWxCategoryMsgInteractive(user *models.WxUserItem, interactive string, a
 			return
 		}
 		keyword1 = user.RealName + "-" + user.CompanyName
+		keyword1 = utils.TruncateActivityNameString(keyword1)
 		keyword2 = fmt.Sprint("互动提醒:", interactive)
 		keyword3 = detail.Title
 		keyword4 = time.Now().Format(utils.FormatDateTimeMinute2)
@@ -702,7 +704,7 @@ func SendWxCategoryMsgInteractive(user *models.WxUserItem, interactive string, a
 
 		sendInfo := new(SendWxCategoryTemplate)
 		sendInfo.Keywords = keywords
-		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdCompanyApprovalMessageRai
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
 		sendInfo.RedirectTarget = 3
 		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
 		sendInfo.OpenIdArr = openIdArr