zhangchuanxing пре 3 дана
родитељ
комит
e6dfd670e6
1 измењених фајлова са 10 додато и 9 уклоњено
  1. 10 9
      services/cygx_template_record_source.go

+ 10 - 9
services/cygx_template_record_source.go

@@ -27,7 +27,6 @@ func SendCygxTemplateRecordSource(log models.WxUserRaiLabelRedis) (err error) {
 	var keyword2 string
 	var keyword3 string
 	var keyword4 string
-	var keyword5 string
 	var redirectUrl string
 
 	wxUser, e := models.GetWxUserItemByUserId(userId)
@@ -125,9 +124,6 @@ func SendCygxTemplateRecordSource(log models.WxUserRaiLabelRedis) (err error) {
 		return
 	}
 
-	var keywords []string
-	keywords = append(keywords, keyword1, keyword2, keyword3, keyword4, keyword5)
-
 	openIdList, e := models.GetMfyxWxOpenIdByMobileList(strings.Join(mobiles, ","))
 	if e != nil {
 		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
@@ -141,13 +137,18 @@ func SendCygxTemplateRecordSource(log models.WxUserRaiLabelRedis) (err error) {
 		openIdArr = append(openIdArr, v.OpenId)
 	}
 	//redirectUrl = utils.WX_MSG_PATH_TEMPLATE_MSG + "SourceId=" + strconv.Itoa(msgId) + "&SourceType=1"
-	sendInfo := new(SendWxCategoryTemplate)
-	sendInfo.Keywords = keywords
+
+	sendInfo := new(SendWxTemplate)
+	sendInfo.Keyword1 = keyword1
+	sendInfo.Keyword2 = keyword2
+	sendInfo.Keyword3 = keyword3
+	sendInfo.Keyword4 = keyword4
 	sendInfo.TemplateId = utils.WxMsgTemplateIdArticleUserRemind
-	sendInfo.RedirectTarget = 4
+	sendInfo.RedirectUrl = redirectUrl
+	sendInfo.RedirectTarget = 3
+	sendInfo.Resource = strconv.Itoa(sourceId)
 	sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_APPLY
 	sendInfo.OpenIdArr = openIdArr
-	sendInfo.RedirectUrl = redirectUrl
-	err = SendCategoryTemplateMsg(sendInfo)
+	err = PublicSendTemplateMsg(sendInfo)
 	return
 }