Merge branch 'cygx/cygx_14_7' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -227,18 +227,15 @@ func (this *CalendarController) Add() {
 			br.ErrMsg = "获取客户信息失败, Err: " + err.Error()
 			return
 		}
+		if addType == 3 {
+			br.Msg = "客户暂无路演权限，请开通对应行业权限或者购买【路演服务】权限"
+			br.ErrMsg = "客户暂无路演权限，请开通对应行业权限或者购买【路演服务】权限 "
+			return
+		}
 		isRaiRoadShow = true
 		resp.Points = points
 		resp.AddType = addType
 
-		if addType == 2 {
-			br.Ret = 200
-			br.Success = true
-			br.Data = resp
-			br.Msg = "保存成功"
-			br.IsAddLog = true
-			return
-		}
 	}
 
 	rsCalendar := new(roadshow.RsCalendar)
@@ -678,17 +675,14 @@ func (this *CalendarController) Edit() {
 			br.ErrMsg = "获取客户信息失败, Err: " + err.Error()
 			return
 		}
+		if addType == 3 {
+			br.Msg = "客户暂无路演权限，请开通对应行业权限或者购买【路演服务】权限"
+			br.ErrMsg = "客户暂无路演权限，请开通对应行业权限或者购买【路演服务】权限 "
+			return
+		}
 		isRaiRoadShow = true
 		resp.Points = points
 		resp.AddType = addType
-		if addType == 2 {
-			br.Ret = 200
-			br.Success = true
-			br.Data = resp
-			br.Msg = "保存成功"
-			br.IsAddLog = true
-			return
-		}
 	}
 
 	err = roadshow.UpdateRsCalendar(calendarWhereParams, calendarUpdateParams)