Merge branch 'cygx_8.6' into debug

controllers/report.go

@@ -3237,11 +3237,7 @@ func (this *ReportController) CommentAdd() {
 					openIdList = append(openIdList, idList)
 				}
 			}
-			list, _ := models.GetWxOpenIdByMobileList("15557270714")
-			for _, idList := range list {
-				openIdList = append(openIdList, idList)
-			}
-			services.SendCommentWxTemplateMsg(articleInfo.Title, user.CompanyName, user.RealName, sellerItem.RealName,openIdList, req.ArticleId)
+			services.SendCommentWxTemplateMsg(articleInfo.Title, user.CompanyName, user.RealName, sellerItem.RealName, item.CreateTime.Format(utils.FormatDateTime), req.Content, openIdList, req.ArticleId)
 		}
 	}
 

services/wx_template_msg.go

@@ -660,7 +660,7 @@ func SendActivityOnenIdWxTemplateMsg(first, keyWord1, keyWord2, keyWord3, keyWor
 }
 
 //发送用户留言提醒
-func SendCommentWxTemplateMsg(title, companyName, userName, sellerName string, openIdList []*models.OpenIdList, articleId int) (err error) {
+func SendCommentWxTemplateMsg(title, companyName, userName, sellerName, createTime, content string, openIdList []*models.OpenIdList, articleId int) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
@@ -681,6 +681,8 @@ func SendCommentWxTemplateMsg(title, companyName, userName, sellerName string, o
 	var first string
 	first = "【"+title+"】有新的留言，请及时处理"
 	keyword1 := companyName + "--" + userName + "（" + sellerName + "）"
+	keyword3 := createTime
+	keyword4 := content
 	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	templateId := utils.WxMsgTemplateIdArticleUserRemind
 	sendMap := make(map[string]interface{})
@@ -689,6 +691,8 @@ func SendCommentWxTemplateMsg(title, companyName, userName, sellerName string, o
 	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["keyword3"] = map[string]interface{}{"value": keyword3, "color": "#173177"}
+	sendData["keyword4"] = map[string]interface{}{"value": keyword4, "color": "#173177"}
 	sendMap["data"] = sendData
 	WxSendTemplateMsg(sendUrl, sendMap, openIdList, strconv.Itoa(articleId), utils.TEMPLATE_MSG_CYGX_COMMENT)
 	return