fix：研报小程序的活动提醒

services/activity.go

@@ -112,8 +112,8 @@ func sendWxMsg(activityInfo *yb.Activity, remindType string) (err error) {
 	}
 
 	first := `您有一场【` + activityInfo.ActivityTypeName + `】将在` + timeStr + `后开始`
-	keyword1 := activityInfo.ActivityName
-	keyword2 := "- -"
+	keyword1 := activityInfo.ActivityTypeName + "-" + activityInfo.ActivityName
+	keyword2 := "将在" + timeStr + "后开始"
 	//keyword3 := `2021-10-18 16:30-17:00 星期一`
 	keyword3 := formatActivityTimeStr(activityInfo.StartTime, activityInfo.EndTime)
 

services/wx_template_msg.go

@@ -173,33 +173,23 @@ func SendWxMsgWithActivityAppointmentRemind(first, keyword1, keyword2, keyword3,
 		}
 	}()
 	utils.FileLog.Info("%s", "services SendMsg")
-	accessToken, err := models.GetWxAccessToken()
-	if err != nil {
-		msg = "GetWxAccessToken Err:" + err.Error()
-		return
-	}
-	if accessToken == "" {
-		msg = "accessToken is empty"
-		return
-	}
-
-	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-	sendMap := make(map[string]interface{})
-	sendData := make(map[string]interface{})
-
-	sendMap["template_id"] = utils.AppointmentRemindTemplateId
-	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["activity_name"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["reserve_results"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
-	sendData["activity_time"] = map[string]interface{}{"value": keyword3, "color": "#173177"}
-	sendData["activity_address"] = map[string]interface{}{"value": keyword4, "color": "#173177"}
-	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
 
-	if wxAppPath != "" {
-		sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxYbAppId, "pagepath": wxAppPath}
+	openIdArr := make([]string, len(openIdList))
+	for i, v := range openIdList {
+		openIdArr[i] = v.OpenId
 	}
-	sendMap["data"] = sendData
-	WxSendTemplateMsg(sendUrl, sendMap, openIdList)
+	sendInfo := new(SendWxTemplate)
+	sendInfo.WxAppId = utils.WxAppId
+	sendInfo.First = first
+	sendInfo.Keyword1 = keyword1
+	sendInfo.Keyword2 = keyword2
+	sendInfo.RedirectUrl = wxAppPath
+	sendInfo.RedirectTarget = 1
+	sendInfo.TemplateId = utils.AppointmentRemindTemplateId
+	sendInfo.Resource = wxAppPath
+	sendInfo.OpenIdArr = openIdArr
+	sendInfo.Remark = remark
+	err = SendTemplateMsgV2(sendInfo)
 	return
 }
 

utils/config.go

@@ -7,13 +7,13 @@ import (
 )
 
 var (
-	RunMode        string //运行模式
-	MYSQL_URL      string //数据库连接
-	MYSQL_URL_RDDP string //数据库连接
-	MYSQL_URL_EDB  string
-	MYSQL_URL_DATA string
-	MYSQL_URL_GL   string
-	MYSQL_URL_WEEKLY_TRIAL       string // ETA试用
+	RunMode                string //运行模式
+	MYSQL_URL              string //数据库连接
+	MYSQL_URL_RDDP         string //数据库连接
+	MYSQL_URL_EDB          string
+	MYSQL_URL_DATA         string
+	MYSQL_URL_GL           string
+	MYSQL_URL_WEEKLY_TRIAL string // ETA试用
 )
 
 var (
@@ -33,11 +33,11 @@ var (
 	WxYbAppId string //微信研报小程序
 
 	//内部员工公众号（弘则部门）
-	AdminWxAppId                    string
-	AdminWxAppSecret                string
+	AdminWxAppId     string
+	AdminWxAppSecret string
 )
 
-//oss配置
+// oss配置
 var (
 	Bucketname       string = "hongze"
 	Endpoint         string
@@ -61,14 +61,14 @@ var (
 	EDB_LIB_URL string
 )
 
-//进门财经账号信息
+// 进门财经账号信息
 var (
 	COMEIN_URL      string
 	COMEIN_APPID    string
 	COMEIN_SECREKEY string
 )
 
-//模板消息推送
+// 模板消息推送
 var (
 	SendWxTemplateMsgUrl string
 )
@@ -131,6 +131,8 @@ ZwIDAQAB
 		WxAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
 		TemplateId = "DGvLwidav-OZc07klLv5mxwxO63qHdWS5Cj-rTDvTQo"
 		RemindTemplateId = "rCvkgRatnK_3N9pnQEErUyjFkyVpyAGuYtv3HwY82K4"
+		AppointmentRemindTemplateId = `pdbn6Wr84Rr-Ek7zrYHcxh5RO5ROILHjbkj3em68954` //活动预约通知模板id
+
 		//同花顺正式地址
 		THS_SendUrl = `https://board.10jqka.com.cn/gateway/ps/syncNews`
 		THS_SyncWxGroupUrl = `https://board.10jqka.com.cn/gateway/ps/syncWechatGroupInfo`
@@ -151,7 +153,7 @@ ZwIDAQAB
 		WxAppSecret = "f4d52e34021eee262dce9682b31f8861"
 		TemplateId = "DGvLwidav-OZc07klLv5mxwxO63qHdWS5Cj-rTDvTQo"
 		RemindTemplateId = "rCvkgRatnK_3N9pnQEErUyjFkyVpyAGuYtv3HwY82K4"
-		AppointmentRemindTemplateId = `Y59n_AHg-RLCKaz293geW76KDHpGL1qOnE7eF_lxelY` //活动预约通知模板id
+		AppointmentRemindTemplateId = `U3su--7d6xsCDcP6Tya0N0wWpKn_uI0zO1cutRK52cc` //活动预约通知模板id
 
 		//同花顺测试地址
 		THS_SendUrl = `https://mtest.10jqka.com.cn/gateway/ps/syncNews`