Merge branch 'wechat/template' into debug

services/wechat/template_msg.go

@@ -62,7 +62,7 @@ type SendWxTemplate struct {
 	OpenIdArr      []string `description:"消息接收者openid"`
 }
 
-//推送模板消息
+// 推送模板消息
 func SendTemplateMsg(sendInfo *SendWxTemplate) (err error) {
 	postData, err := json.Marshal(sendInfo)
 	if err != nil {
@@ -320,7 +320,7 @@ func SendQuestionReplyWxMsg(questionId, userId int, questionTitle string) (err e
 }
 
 // SendVoiceBroadcastWxMsg 推送研报小程序模板消息-语音播报
-func SendVoiceBroadcastWxMsg(broadcastId,varietyId int, sectionName, broadcastName string) (err error) {
+func SendVoiceBroadcastWxMsg(broadcastId, varietyId int, sectionName, broadcastName string) (err error) {
 	var errMsg string
 	defer func() {
 		if err != nil {
@@ -329,7 +329,7 @@ func SendVoiceBroadcastWxMsg(broadcastId,varietyId int, sectionName, broadcastNa
 		}
 	}()
 
-	openIdArr,err:=wx_user.GetOpenIdArrByVarietyTag(varietyId)
+	openIdArr, err := wx_user.GetOpenIdArrByVarietyTag(varietyId)
 
 	//List, err := wx_user.GetOpenIdList()
 	//if err != nil {
@@ -350,8 +350,10 @@ func SendVoiceBroadcastWxMsg(broadcastId,varietyId int, sectionName, broadcastNa
 	//sendData := make(map[string]interface{})
 
 	first := "您好，有新的语音播报待查看"
-	keyword1 := sectionName + "：" + broadcastName
-	keyword2 := "待查看"
+	//keyword1 := sectionName + "：" + broadcastName
+	//keyword2 := "待查看"
+	keyword1 := broadcastName
+	keyword2 := fmt.Sprintf("【%s】 待查看", sectionName)
 	remark := "请点击详情查看"
 
 	//sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}