fix:路演模板调整

controllers/roadshow/calendar.go

@@ -497,16 +497,13 @@ func (this *CalendarController) Accept() {
 		if rsCalendar != nil {
 			sysAdmin, _ := admin.GetAdminById(rsCalendar.SysUserId)
 			first := "【" + this.AdminWx.RealName + "】接受了你的【" + rsCalendar.ActivityType + "】申请"
-			var keyword1 string
-			if rsCalendar.ActivityType == "路演" {
-				keyword1 = rsCalendar.CompanyName + "，" + rsCalendar.RoadshowType + rsCalendar.ActivityType
-			} else {
-				keyword1 = rsCalendar.Theme + "，" + rsCalendar.RoadshowType + rsCalendar.ActivityType
-			}
-			keyword2 := "已接受"
+			var keyword1, keyword2, keyword3, keyword4, keyword5 string
+			keyword1 = rsCalendar.CompanyName + "（" + rsCalendar.RoadshowType + rsCalendar.ActivityType + "）"
+			keyword2 = rsCalendar.ActivityType
+			keyword4 = `【` + sysAdmin.RealName + `】已接受`
 			remark := ""
 			if sysAdmin.Mobile != "" {
-				go services.SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark, sysAdmin.Mobile, "", "")
+				go services.SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, keyword3, keyword4, keyword5, remark, sysAdmin.Mobile, "", "")
 			}
 		}
 	}
@@ -583,16 +580,15 @@ func (this *CalendarController) Refuse() {
 		if rsCalendar != nil {
 			sysAdmin, _ := admin.GetAdminById(rsCalendar.SysUserId)
 			first := "【" + this.AdminWx.RealName + "】拒绝了你的【" + rsCalendar.ActivityType + "】申请"
-			var keyword1 string
-			if rsCalendar.ActivityType == "路演" {
-				keyword1 = rsCalendar.CompanyName + "，" + rsCalendar.RoadshowType + rsCalendar.ActivityType
-			} else {
-				keyword1 = rsCalendar.Theme + "，" + rsCalendar.RoadshowType + rsCalendar.ActivityType
-			}
-			keyword2 := "已拒绝"
+			var keyword1, keyword2, keyword3, keyword4, keyword5 string
+			keyword1 = rsCalendar.CompanyName + "（" + rsCalendar.RoadshowType + rsCalendar.ActivityType + "）"
+			keyword2 = rsCalendar.ActivityType
+			keyword4 = `【` + sysAdmin.RealName + `】已拒绝`
+			keyword5 = req.RefuseReason
+
 			remark := req.RefuseReason
 			if sysAdmin.Mobile != "" {
-				go services.SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark, sysAdmin.Mobile, "", "")
+				go services.SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, keyword3, keyword4, keyword5, remark, sysAdmin.Mobile, "", "")
 			}
 		}
 	}

services/wechat_send_msg.go

@@ -21,6 +21,7 @@ type SendWxTemplate struct {
 	Keyword2       string   `description:"模板消息keyword2字段"`
 	Keyword3       string   `description:"模板消息keyword3字段"`
 	Keyword4       string   `description:"模板消息keyword4字段"`
+	Keyword5       string   `description:"模板消息keyword5字段"`
 	Remark         string   `description:"模板消息remark字段"`
 	TemplateId     string   `description:"模板id"`
 	RedirectUrl    string   `description:"跳转地址"`
@@ -142,7 +143,7 @@ func SendCompanyApplyWxTemplateMsg(mobile, redirectUrl, wxAppPath string, wxMsgM
 }
 
 // SendWxMsgWithRoadshowDetailResult 路演->销售收到处理结果
-func SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark, mobile, redirectUrl, wxAppPath string) (err error) {
+func SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, keyword3, keyword4, keyword5, remark, mobile, redirectUrl, wxAppPath string) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
@@ -199,6 +200,9 @@ func SendWxMsgWithRoadshowDetailResult(first, keyword1, keyword2, remark, mobile
 		sendInfo.First = first
 		sendInfo.Keyword1 = keyword1
 		sendInfo.Keyword2 = keyword2
+		sendInfo.Keyword3 = keyword3
+		sendInfo.Keyword4 = keyword4
+		sendInfo.Keyword5 = keyword5
 		sendInfo.Remark = remark
 		sendInfo.TemplateId = utils.WxMsgTemplateIdWithRoadshowDetailResult
 		if wxAppPath != "" && utils.RunMode == "release" {

utils/config.go

@@ -18,7 +18,7 @@ var (
 	Re          error        //redis错误
 )
 
-//微信配置信息
+// 微信配置信息
 var (
 	WxId                            string //微信原始ID
 	WxAppId                         string
@@ -30,8 +30,8 @@ var (
 	TemplateCompanyApplyRedirectUrl string //审批单模板消息跳转地址
 
 	//内部员工公众号（弘则部门）
-	AdminWxAppId                    string
-	AdminWxAppSecret                string
+	AdminWxAppId     string
+	AdminWxAppSecret string
 
 	//微信小程序appid
 	WxId2        string //微信原始ID
@@ -44,9 +44,9 @@ var (
 	WxMsgTemplateIdWithRoadshowPending      string //路演->研究员收到待处理的申请
 	WxMsgTemplateIdWithRoadshowDetailResult string //路演->销售收到处理结果
 	WxMsgTemplateIdWithRoadshowDeleteNotice string //路演->研究员收到活动删除通知
-	WxMsgTemplateIdWithSealApplyFinished      string // 用印申请-已签回通知
+	WxMsgTemplateIdWithSealApplyFinished    string // 用印申请-已签回通知
 	WxMsgTemplateIdWithYbCommunityQuestion  string // 研报小程序->问答社区回复通知
-	SendWxTemplateMsgUrl string  //模板消息推送
+	SendWxTemplateMsgUrl                    string //模板消息推送
 
 	//查研观向
 	WxMsgTemplateIdCompanyApprovalMessageRai string //权益销售签约成功通知查研观向小助手模版消息
@@ -187,10 +187,10 @@ func wxConfig() {
 
 		//路演
 		WxMsgTemplateIdWithRoadshowPending = "1JG9fvKx9o9B-wkZe_gBFQQzMBnp07-hvpZI9QiFcKQ"      //路演->研究员收到待处理的申请
-		WxMsgTemplateIdWithRoadshowDetailResult = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" //路演->销售收到处理结果
+		WxMsgTemplateIdWithRoadshowDetailResult = "D6AFTJ7CbDDFBYg1R-HRir5bBXkIqGrwUtb2bjN-Wr4" //路演->销售收到处理结果
 		WxMsgTemplateIdWithRoadshowDeleteNotice = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" //路演->研究员收到活动删除通知
 
-		WxMsgTemplateIdWithSealApplyFinished   = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450"   // 用印申请-已签回通知
+		WxMsgTemplateIdWithSealApplyFinished = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" // 用印申请-已签回通知
 
 		// 研报小程序
 		WxMsgTemplateIdWithYbCommunityQuestion = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" // 研报小程序->问答社区回复通知
@@ -217,15 +217,14 @@ func wxConfig() {
 
 		//路演
 		WxMsgTemplateIdWithRoadshowPending = "1JG9fvKx9o9B-wkZe_gBFQQzMBnp07-hvpZI9QiFcKQ"      //路演->研究员收到待处理的申请
-		WxMsgTemplateIdWithRoadshowDetailResult = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" //路演->销售收到处理结果
+		WxMsgTemplateIdWithRoadshowDetailResult = "D6AFTJ7CbDDFBYg1R-HRir5bBXkIqGrwUtb2bjN-Wr4" //路演->销售收到处理结果
 		WxMsgTemplateIdWithRoadshowDeleteNotice = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" //路演->研究员收到活动删除通知
 
-		WxMsgTemplateIdWithSealApplyFinished   = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450"   // 用印申请-已签回通知
-		
+		WxMsgTemplateIdWithSealApplyFinished = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" // 用印申请-已签回通知
+
 		// 研报小程序
 		WxMsgTemplateIdWithYbCommunityQuestion = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" // 研报小程序->问答社区回复通知
 
-
 		//查研观向小助手原有的模板ID
 		{
 			WxMsgTemplateIdCompanyApprovalMessageRai = "RcV2uM5nFSiUtOHsq4SdYz2Fhk-OVfg5rutWz2IsSJQ" //权益销售签约成功通知查研观向小助手模版消息-模板ID