Merge branch 'bugfix_6486' into debug

# Conflicts:
#	utils/constants.go

controllers/roadshow/calendar.go

@@ -1547,6 +1547,7 @@ func (this *CalendarController) Edit() {
 			calendar := roadshow.RsCalendar{
 				RsCalendarId: req.RsCalendarId,
 				SysUserId:    sysUser.AdminId,
+				CompanyName:  req.CompanyName,
 				Title:        getTitle(req.ActivityType, req.RoadshowType, req.ActivityCategory, req.RoadshowPlatform, req.Province, req.City),
 			}
 			researcher := *rsCalendarResearcherItem
@@ -1556,6 +1557,7 @@ func (this *CalendarController) Edit() {
 			researcher.EndTime = v.EndTime
 			researcher.StartWeek = v.StartWeek
 			researcher.EndWeek = v.EndWeek
+			rs.DeleteSHCalendar(req.RsCalendarResearcherId) // 删除老的
 			go rs.CalendarToSH(calendar, researcher)
 
 			if req.EditType == 2 {
@@ -1910,15 +1912,16 @@ func (this *CalendarController) Delete() {
 			this.FailWithMessage("删除失败！", "删除失败！UpdateCalendarResearcher:"+err.Error())
 			return
 		}
-		itemApiLog := new(roadshow.RsCalendarApiLog)
-		itemApiLog.CreateTime = time.Now()
-		itemApiLog.Remark = "小程序CRM手动删除"
-		itemApiLog.Url = sysUser.RealName
-		itemApiLog.Body = ""
-		itemApiLog.Result = ""
-		itemApiLog.RsCalendarResearcherId = req.RsCalendarResearcherId
-		go roadshow.AddRsCalendarApiLog(itemApiLog)
 	}
+	itemApiLog := new(roadshow.RsCalendarApiLog)
+	itemApiLog.CreateTime = time.Now()
+	itemApiLog.Remark = "小程序CRM手动删除"
+	itemApiLog.Url = sysUser.RealName
+	itemApiLog.Body = ""
+	itemApiLog.Result = ""
+	itemApiLog.RsCalendarResearcherId = req.RsCalendarResearcherId
+	itemApiLog.RsCalendarId = req.RsCalendarId
+	go roadshow.AddRsCalendarApiLog(itemApiLog)
 	//`status` int(11) DEFAULT '0' COMMENT '1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回,6:已结束',
 	for _, rsCalendarResearcherItem := range rsCalendarResearcherItemList {
 		//待接受、已接受的情况，需要同步删除上海那边的日程

models/roadshow/rs_calendar_api_log.go

@@ -13,6 +13,7 @@ type RsCalendarApiLog struct {
 	CreateTime             time.Time `description:"创建时间"`
 	Remark                 string    `description:"备注说明"`
 	RsCalendarResearcherId int       `description:"表rs_calendar_researcher 主键ID"`
+	RsCalendarId           int       `description:"日历活动id"`
 }
 
 // 添加日志记录

utils/config.go

@@ -86,6 +86,8 @@ var (
 	AccessKeySecret  string = "12kk1ptCHoGWedhBnKRVW5hRJzq9Fq"
 )
 
+var ApproveUserId int
+
 func init() {
 	tmpRunMode, err := web.AppConfig.String("run_mode")
 	if err != nil {
@@ -169,6 +171,9 @@ func init() {
 
 	//微信配置
 	wxConfig()
+
+	//出差审批人配置
+	initApproveUserIdConfig()
 }
 
 // CrmOpenApiConfig 上海crm开放api配置
@@ -269,3 +274,11 @@ func wxConfig() {
 //http://webapi.brilliantstart.cn/api/
 //http://webapi.brilliantstart.cn/swagger/
 //http://8.136.199.33:8607/swagger/
+
+// initApproveUserIdConfig 出差审批人配置
+func initApproveUserIdConfig() {
+	ApproveUserId = 9
+	if RunMode == "debug" {
+		ApproveUserId = 231
+	}
+}

utils/constants.go

@@ -183,7 +183,3 @@ const (
 	CYGX_YANXUAN_POINTS_KEY string = "CYGX_YANXUAN_POINTS_KEY" //查研观向研选活动扣点KEY
 )
 
-const (
-	ApproveUserId = 9 //戚明之-出差审批人
-)
-