no message

services/activity.go

@@ -591,7 +591,7 @@ func GetActivityVideoResp(mapActivityId []int) (mapItem map[int]*models.CygxActi
 }
 
 func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, permissionArr []string) (itemActivity *models.ActivityListResp) {
-	articleDetail := item
+	activityDetail := item
 	//IsShowAppointment       bool                       `description:"是否展示预约纪要"`
 	//IsShowOutboundCall      bool                       `description:"是否展示预约外呼"`
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
@@ -600,35 +600,35 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
 
-	if strings.Contains(articleDetail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
-		articleDetail.IsResearch = true
+	if strings.Contains(activityDetail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
+		activityDetail.IsResearch = true
 	}
 	//如果是 公司调研电话会：3，或 专家线下沙龙:5  而且  除易董同步过来的以外的研选类型活动，必须要有研选的正式权限
-	if (articleDetail.ActivityTypeId == 3 || articleDetail.ActivityTypeId == 5) && articleDetail.YidongActivityId == "" && strings.Contains(articleDetail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) && utils.InArrayByStr(permissionArr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
-		articleDetail.IsResearchSpecial = true
+	if (activityDetail.ActivityTypeId == 3 || activityDetail.ActivityTypeId == 5) && activityDetail.YidongActivityId == "" && strings.Contains(activityDetail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) && utils.InArrayByStr(permissionArr, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
+		activityDetail.IsResearchSpecial = true
 	}
-	if articleDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
-		articleDetail.SiginupDeadline = ""
+	if activityDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
+		activityDetail.SiginupDeadline = ""
 	}
 	//如果报名截止时间不规范，或者是非研选扣点活动就把截止时间设置为空
-	if articleDetail.CancelDeadline == utils.FormatDateTimeInit || !articleDetail.IsResearchPoints {
-		articleDetail.CancelDeadline = ""
+	if activityDetail.CancelDeadline == utils.FormatDateTimeInit || !activityDetail.IsResearchPoints {
+		activityDetail.CancelDeadline = ""
 	}
 
-	activityTimeText := articleDetail.ActivityTimeText
+	activityTimeText := activityDetail.ActivityTimeText
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
-	articleDetail.ActivityTimeText = activityTimeText
+	activityDetail.ActivityTimeText = activityTimeText
 	var yidongActivityUrl string
-	articleDetail.IsShowAppointment = false
+	activityDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
-	if articleDetail.YidongActivityId != "" {
-		articleDetail.IsShowSignup = false
-		articleDetail.IsShowDetails = true
+	if activityDetail.YidongActivityId != "" {
+		activityDetail.IsShowSignup = false
+		activityDetail.IsShowDetails = true
 
-		if articleDetail.YidongActivityId != "" {
+		if activityDetail.YidongActivityId != "" {
 			ydTgc, _ := GetYiDongCreateUserInfo(user)
-			yidongLongLink, _ := GetYiDongOriginalLink(articleDetail)
+			yidongLongLink, _ := GetYiDongOriginalLink(activityDetail)
 			if yidongLongLink != "" {
 				yidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
 			}
@@ -636,80 +636,80 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 	} else {
 
 		//专家电话会 1
-		if articleDetail.ActivityTypeId == 1 && articleDetail.IsLimitPeople == 0 && (articleDetail.ActiveState == "1" || articleDetail.ActiveState == "2") {
-			articleDetail.IsShowHelpSsk = true
+		if activityDetail.ActivityTypeId == 1 && activityDetail.IsLimitPeople == 0 && (activityDetail.ActiveState == "1" || activityDetail.ActiveState == "2") {
+			activityDetail.IsShowHelpSsk = true
 		}
-		if articleDetail.ActiveState == "1" {
+		if activityDetail.ActiveState == "1" {
 			//新的是否展示规则
-			if articleDetail.IsCanAppointmentMinutes == 1 {
-				articleDetail.IsShowAppointment = true
+			if activityDetail.IsCanAppointmentMinutes == 1 {
+				activityDetail.IsShowAppointment = true
 			}
 
 			//专家电话会 1
-			if articleDetail.ActivityTypeId == 1 {
-				if articleDetail.LimitPeopleNum == 0 {
-					articleDetail.IsShowOutboundCall = true
+			if activityDetail.ActivityTypeId == 1 {
+				if activityDetail.LimitPeopleNum == 0 {
+					activityDetail.IsShowOutboundCall = true
 				} else {
-					articleDetail.IsShowSignup = true
+					activityDetail.IsShowSignup = true
 				}
-				articleDetail.IsShowMeetingReminder = true
-				articleDetail.IsShowHelpSsk = true
+				activityDetail.IsShowMeetingReminder = true
+				activityDetail.IsShowHelpSsk = true
 			}
 
 			//分析师电话会 2
-			if articleDetail.ActivityTypeId == 2 {
-				if articleDetail.LimitPeopleNum == 0 {
-					articleDetail.IsShowOutboundCall = true
+			if activityDetail.ActivityTypeId == 2 {
+				if activityDetail.LimitPeopleNum == 0 {
+					activityDetail.IsShowOutboundCall = true
 				} else {
-					articleDetail.IsShowSignup = true
+					activityDetail.IsShowSignup = true
 				}
-				articleDetail.IsShowMeetingReminder = true
+				activityDetail.IsShowMeetingReminder = true
 			}
 
-			if articleDetail.ActivityTypeId == 3 {
+			if activityDetail.ActivityTypeId == 3 {
 				//司调研电话会(3)、扣点的研选活动只展示我要报名
-				if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
-					articleDetail.IsShowSignup = true
+				if activityDetail.IsResearchPoints || activityDetail.LimitPeopleNum > 0 {
+					activityDetail.IsShowSignup = true
 				} else {
-					articleDetail.IsShowMeetingReminder = true
-					articleDetail.IsShowOutboundCall = true
+					activityDetail.IsShowMeetingReminder = true
+					activityDetail.IsShowOutboundCall = true
 				}
 			}
 
 			//公司线下调研 4
-			if articleDetail.ActivityTypeId == 4 {
-				articleDetail.IsShowSignup = true
+			if activityDetail.ActivityTypeId == 4 {
+				activityDetail.IsShowSignup = true
 			}
 
 			//专家线下沙龙 5
-			if articleDetail.ActivityTypeId == 5 {
-				articleDetail.IsShowSignup = true
+			if activityDetail.ActivityTypeId == 5 {
+				activityDetail.IsShowSignup = true
 			}
 
 			//分析师线下沙龙 6
-			if articleDetail.ActivityTypeId == 6 {
-				articleDetail.IsShowSignup = true
+			if activityDetail.ActivityTypeId == 6 {
+				activityDetail.IsShowSignup = true
 			}
 
 			//分析师电话会（C类） 7
-			if articleDetail.ActivityTypeId == 7 {
-				articleDetail.IsShowSignup = true
-				articleDetail.IsShowMeetingReminder = true
+			if activityDetail.ActivityTypeId == 7 {
+				activityDetail.IsShowSignup = true
+				activityDetail.IsShowMeetingReminder = true
 			}
 			//如果是易董创建的活动，展示我要报名，不展示预约外呼
-			if articleDetail.IsYidongConduct {
-				articleDetail.IsShowSignup = true
-				articleDetail.IsShowOutboundCall = false
+			if activityDetail.IsYidongConduct {
+				activityDetail.IsShowSignup = true
+				activityDetail.IsShowOutboundCall = false
 			}
 		}
 	}
-	articleDetail.IsResearchPoints = activityPointsByUserAllMap[articleDetail.ActivityId]
+	activityDetail.IsResearchPoints = activityPointsByUserAllMap[activityDetail.ActivityId]
 	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 	if e != nil {
 		e = errors.New("获取用户权限失败, Err: " + e.Error())
 		return
 	}
-	v := articleDetail
+	v := activityDetail
 	itemActivity = &models.ActivityListResp{
 		ActivityId:              v.ActivityId,
 		ActivityTypeId:          v.ActivityTypeId,

services/activity_button.go

@@ -291,8 +291,8 @@ func HandleActivityListButton(list []*models.ActivityDetail, user *models.WxUser
 	return
 }
 
-func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserItem) (articleDetail *models.ActivityDetail) {
-	articleDetail = item
+func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserItem) (activityDetail *models.ActivityDetail) {
+	activityDetail = item
 	//IsShowAppointment       bool                       `description:"是否展示预约纪要"`
 	//IsShowOutboundCall      bool                       `description:"是否展示预约外呼"`
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
@@ -305,95 +305,95 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 	//}
 
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
-	articleDetail.IsResearchPoints = activityPointsByUserAllMap[articleDetail.ActivityId]
-	if articleDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
-		articleDetail.SiginupDeadline = ""
+	activityDetail.IsResearchPoints = activityPointsByUserAllMap[activityDetail.ActivityId]
+	if activityDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
+		activityDetail.SiginupDeadline = ""
 	}
 	//如果报名截止时间不规范，或者是非研选扣点活动就把截止时间设置为空
-	if articleDetail.CancelDeadline == utils.FormatDateTimeInit || !articleDetail.IsResearchPoints {
-		articleDetail.CancelDeadline = ""
+	if activityDetail.CancelDeadline == utils.FormatDateTimeInit || !activityDetail.IsResearchPoints {
+		activityDetail.CancelDeadline = ""
 	}
 	//articleDetail.SourceType = 1
-	activityTimeText := articleDetail.ActivityTimeText
+	activityTimeText := activityDetail.ActivityTimeText
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
-	articleDetail.ActivityTimeText = activityTimeText
+	activityDetail.ActivityTimeText = activityTimeText
 
-	articleDetail.IsShowAppointment = false
+	activityDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
-	if articleDetail.YidongActivityId != "" {
-		articleDetail.IsShowSignup = false
-		articleDetail.IsShowDetails = true
-		if articleDetail.YidongActivityId != "" {
+	if activityDetail.YidongActivityId != "" {
+		activityDetail.IsShowSignup = false
+		activityDetail.IsShowDetails = true
+		if activityDetail.YidongActivityId != "" {
 			ydTgc, _ := GetYiDongCreateUserInfo(user)
-			yidongLongLink, _ := GetYiDongOriginalLink(articleDetail)
+			yidongLongLink, _ := GetYiDongOriginalLink(activityDetail)
 			if yidongLongLink != "" {
-				articleDetail.YidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
+				activityDetail.YidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
 			}
 		}
 	} else {
 		//专家电话会 1
-		if articleDetail.ActivityTypeId == 1 && articleDetail.IsLimitPeople == 0 && (articleDetail.ActiveState == "1" || articleDetail.ActiveState == "2") {
-			articleDetail.IsShowHelpSsk = true
+		if activityDetail.ActivityTypeId == 1 && activityDetail.IsLimitPeople == 0 && (activityDetail.ActiveState == "1" || activityDetail.ActiveState == "2") {
+			activityDetail.IsShowHelpSsk = true
 		}
-		if articleDetail.ActiveState == "1" {
-			if articleDetail.IsCanAppointmentMinutes == 1 {
-				articleDetail.IsShowAppointment = true
+		if activityDetail.ActiveState == "1" {
+			if activityDetail.IsCanAppointmentMinutes == 1 {
+				activityDetail.IsShowAppointment = true
 			}
 			//专家电话会 1
 			//专家电话会限制人数的展示我要报名，不限制的展示预约外外呼
-			if articleDetail.ActivityTypeId == 1 {
+			if activityDetail.ActivityTypeId == 1 {
 				//articleDetail.IsShowOutboundCall = true
-				if articleDetail.LimitPeopleNum == 0 {
-					articleDetail.IsShowOutboundCall = true
+				if activityDetail.LimitPeopleNum == 0 {
+					activityDetail.IsShowOutboundCall = true
 					//articleDetail.IsShowHelpSsk = true
 				} else {
-					articleDetail.IsShowSignup = true
+					activityDetail.IsShowSignup = true
 				}
-				articleDetail.IsShowMeetingReminder = true
-				articleDetail.IsShowHelpSsk = true
+				activityDetail.IsShowMeetingReminder = true
+				activityDetail.IsShowHelpSsk = true
 			}
 
 			//分析师电话会 2
-			if articleDetail.ActivityTypeId == 2 {
-				if articleDetail.LimitPeopleNum == 0 {
-					articleDetail.IsShowOutboundCall = true
+			if activityDetail.ActivityTypeId == 2 {
+				if activityDetail.LimitPeopleNum == 0 {
+					activityDetail.IsShowOutboundCall = true
 				} else {
-					articleDetail.IsShowSignup = true
+					activityDetail.IsShowSignup = true
 				}
-				articleDetail.IsShowMeetingReminder = true
+				activityDetail.IsShowMeetingReminder = true
 			}
 
 			//公司调研电话会 3
-			if articleDetail.ActivityTypeId == 3 {
+			if activityDetail.ActivityTypeId == 3 {
 				//司调研电话会(3)、扣点的研选活动只展示我要报名
-				if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
-					articleDetail.IsShowSignup = true
+				if activityDetail.IsResearchPoints || activityDetail.LimitPeopleNum > 0 {
+					activityDetail.IsShowSignup = true
 				} else {
-					articleDetail.IsShowMeetingReminder = true
-					articleDetail.IsShowOutboundCall = true
+					activityDetail.IsShowMeetingReminder = true
+					activityDetail.IsShowOutboundCall = true
 				}
 			}
 
 			//公司线下调研 4
-			if articleDetail.ActivityTypeId == 4 {
-				articleDetail.IsShowSignup = true
+			if activityDetail.ActivityTypeId == 4 {
+				activityDetail.IsShowSignup = true
 			}
 
 			//专家线下沙龙 5
-			if articleDetail.ActivityTypeId == 5 {
-				articleDetail.IsShowSignup = true
+			if activityDetail.ActivityTypeId == 5 {
+				activityDetail.IsShowSignup = true
 			}
 
 			//分析师线下沙龙 6
-			if articleDetail.ActivityTypeId == 6 {
-				articleDetail.IsShowSignup = true
+			if activityDetail.ActivityTypeId == 6 {
+				activityDetail.IsShowSignup = true
 			}
 
 			//分析师电话会（C类） 7
-			if articleDetail.ActivityTypeId == 7 {
-				articleDetail.IsShowSignup = true
-				articleDetail.IsShowMeetingReminder = true
+			if activityDetail.ActivityTypeId == 7 {
+				activityDetail.IsShowSignup = true
+				activityDetail.IsShowMeetingReminder = true
 			}
 		}
 	}

services/activity_points.go

@@ -49,7 +49,6 @@ func GetActivityPointsByUserAllMap() (mapResp map[int]bool) {
 	for _, v := range list {
 		mapResp[v.ActivityId] = true
 	}
-	fmt.Println(mapResp)
 	return
 }