Merge branch 'CRM6.2'

models/roadshow/calendar.go

@@ -475,8 +475,8 @@ func GetResearcher() (list []*Researcher, err error) {
 // 删除
 func DeleteCalendar(rsCalendarId, rsCalendarResearcherId int) (err error) {
 	o := orm.NewOrm()
-	sql := ` DELETE FROM rs_calendar_researcher WHERE rs_calendar_researcher_id=? `
-	_, err = o.Raw(sql, rsCalendarResearcherId).Exec()
+	sql := ` DELETE FROM rs_calendar_researcher WHERE rs_calendar_id=? `
+	_, err = o.Raw(sql, rsCalendarId).Exec()
 	if err != nil {
 		return err
 	}

utils/config.go

@@ -131,9 +131,9 @@ func init() {
 		Endpoint = "oss-cn-shanghai-internal.aliyuncs.com"
 
 		//路演
-		WxMsgTemplateIdWithRoadshowPending = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"      //路演->研究员收到待处理的申请
-		WxMsgTemplateIdWithRoadshowDetailResult = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM" //路演->销售收到处理结果
-		WxMsgTemplateIdWithRoadshowDeleteNotice = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM" //路演->研究员收到活动删除通知
+		WxMsgTemplateIdWithRoadshowPending = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"      //路演->研究员收到待处理的申请
+		WxMsgTemplateIdWithRoadshowDetailResult = "dYg6iHooRq74PyCXmw_Ns7qdJZmbtLoKS2p2FKeaXl0" //路演->销售收到处理结果
+		WxMsgTemplateIdWithRoadshowDeleteNotice = "dYg6iHooRq74PyCXmw_Ns7qdJZmbtLoKS2p2FKeaXl0" //路演->研究员收到活动删除通知
 	} else {
 		WxAppId = "wx9b5d7291e581233a"
 		WxAppSecret = "f4d52e34021eee262dce9682b31f8861"