no message

controllers/activity.go

@@ -1324,6 +1324,15 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 	//if total <= 1 {
 	//	resp.GoFollow = true
 	//}
+	detailActivityType, err := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取信息失败,GetActivityTypeDetailById Err:" + err.Error()
+		return
+	}
+	resp.ActivityTypeName = activityInfo.ActivityName
+	resp.ActivityTime = activityInfo.ActivityTime
+	resp.ActivityType = detailActivityType.ActivityType
 	br.Ret = 200
 	br.Success = true
 	if hasPermission == 1 {
@@ -3598,6 +3607,15 @@ func (this *ActivityCoAntroller) ActivityAppointmentAdd() {
 	//if total <= 1 {
 	//	resp.GoFollow = true
 	//}
+	detailActivityType, err := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取信息失败,GetActivityTypeDetailById Err:" + err.Error()
+		return
+	}
+	resp.ActivityTypeName = activityInfo.ActivityName
+	resp.ActivityTime = activityInfo.ActivityTime
+	resp.ActivityType = detailActivityType.ActivityType
 	br.Ret = 200
 	br.Success = true
 	if hasPermission == 1 {

services/activity.go

@@ -2248,8 +2248,9 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
 	//IsShowHelpSsk           bool                       `description:"是否展示帮我带问"`
 	//IsShowSignup            bool                       `description:"是否展示我要报名"`
-
-	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+	activityTypeIdMap := GetActivityTypeIdMap()
+	activityDetail.ActivityType = activityTypeIdMap[activityDetail.ActivityTypeId] // 线上还是线下
+	activityPointsByUserAllMap := GetActivityPointsByUserAllMap()                  // 获取对用户进行研选扣点的活动
 	activityDetail.IsResearchPoints = activityPointsByUserAllMap[activityDetail.ActivityId]
 	if activityDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
 		activityDetail.SiginupDeadline = ""
@@ -2363,7 +2364,9 @@ func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.Act
 
 func ActivityArrButtonShow(items []*models.ActivityDetail) (activityDetails []*models.ActivityDetail) {
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+	activityTypeIdMap := GetActivityTypeIdMap()
 	for _, activityDetail := range items {
+		activityDetail.ActivityType = activityTypeIdMap[activityDetail.ActivityTypeId] // 线上还是线下
 		if activityDetail.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 			activityDetail.IsResearch = true
 		}
@@ -2774,3 +2777,24 @@ func UpdateIsSendYidongSignUp(activityId int) (err error) {
 	err = models.UPdateSendedYiDongSignUp(activityId)
 	return
 }
+
+// 获取活动线上还是线下的类型
+func GetActivityTypeIdMap() (mapResp map[int]int) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("获取活动线上还是线下的类型，失败,GetActivityTypeIdMap：Err "+err.Error(), 2)
+		}
+	}()
+	list, e := models.GetActivityTypeList("")
+	if e != nil {
+		err = errors.New("GetActivityTypeList, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[int]int, 0)
+	for _, v := range list {
+		mapResp[v.ActivityTypeId] = v.ActivityType
+	}
+	return
+}

services/es_comprehensive.go

@@ -1186,10 +1186,12 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			e = errors.New("GetActivitySignupResp, Err: " + e.Error())
 			return
 		}
+		activityTypeIdMap := GetActivityTypeIdMap()
 
 		var activityListRersp []*models.ActivityDetail
 		for _, v := range activityList {
 			v.SignupType = mapActivitySignup[v.ActivityId]
+			v.ActivityType = activityTypeIdMap[v.ActivityTypeId] // 线上还是线下
 			activityListRersp = append(activityListRersp, ActivityButtonShow(v))
 		}
 		for _, v := range activityListRersp {