浏览代码

修改模板消息展示形式

longyu 3 年之前
父节点
当前提交
d67a71000f
共有 1 个文件被更改,包括 12 次插入2 次删除
  1. 12 2
      controllers/roadshow/calendar.go

+ 12 - 2
controllers/roadshow/calendar.go

@@ -143,7 +143,12 @@ func (this *CalendarController) Accept() {
 		if rsCalendar != nil {
 		if rsCalendar != nil {
 			sysAdmin, _ := admin.GetAdminById(rsCalendar.SysUserId)
 			sysAdmin, _ := admin.GetAdminById(rsCalendar.SysUserId)
 			first := "【" + this.AdminWx.RealName + "】接受了你的【" + rsCalendar.ActivityType + "】申请"
 			first := "【" + this.AdminWx.RealName + "】接受了你的【" + rsCalendar.ActivityType + "】申请"
-			keyword1 := rsCalendar.CompanyName + "," + rsCalendar.RoadshowType
+			var keyword1 string
+			if rsCalendar.ActivityType == "路演" {
+				keyword1 = rsCalendar.CompanyName + "," + rsCalendar.RoadshowType + rsCalendar.ActivityType
+			} else {
+				keyword1 = rsCalendar.Theme + "," + rsCalendar.RoadshowType + rsCalendar.ActivityType
+			}
 			keyword2 := "已接受"
 			keyword2 := "已接受"
 			remark := ""
 			remark := ""
 			if sysAdmin.Mobile != "" {
 			if sysAdmin.Mobile != "" {
@@ -221,7 +226,12 @@ func (this *CalendarController) Refuse() {
 		if rsCalendar != nil {
 		if rsCalendar != nil {
 			sysAdmin, _ := admin.GetAdminById(rsCalendar.SysUserId)
 			sysAdmin, _ := admin.GetAdminById(rsCalendar.SysUserId)
 			first := "【" + this.AdminWx.RealName + "】拒绝了你的【" + rsCalendar.ActivityType + "】申请"
 			first := "【" + this.AdminWx.RealName + "】拒绝了你的【" + rsCalendar.ActivityType + "】申请"
-			keyword1 := rsCalendar.CompanyName + "," + rsCalendar.RoadshowType
+			var keyword1 string
+			if rsCalendar.ActivityType == "路演" {
+				keyword1 = rsCalendar.CompanyName + "," + rsCalendar.RoadshowType + rsCalendar.ActivityType
+			} else {
+				keyword1 = rsCalendar.Theme + "," + rsCalendar.RoadshowType + rsCalendar.ActivityType
+			}
 			keyword2 := "已拒绝"
 			keyword2 := "已拒绝"
 			remark := req.RefuseReason
 			remark := req.RefuseReason
 			if sysAdmin.Mobile != "" {
 			if sysAdmin.Mobile != "" {