no message

controllers/activity.go

@@ -2391,9 +2391,9 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
-		if v.YidongActivityId > 0 {
-			item.IsExternalLabel = true
-		}
+		//if v.YidongActivityId > 0 {
+		//	item.IsExternalLabel = true
+		//}
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
 		mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)] = item.KeyWord
 	}

models/activity.go

@@ -64,6 +64,7 @@ type CygxActivity struct {
 	ActivityJoinType        string    `description:"活动入会类型01报名审核后可入会 02预约即可入会 03仅定向邀请人员可入会"`
 	YidongSignUpEnd         string    `description:"易董活动截止时间"` // 报名结束时间，适应于报名审核后可入会，为空表示不限制报名时间
 	YidongSignUpStart       string    `description:"易董活动截止时间"` // 报名开始时间，适应于报名审核后可入会，为空表示不限制报名时间
+	IsExternalLabel         int       `description:"是否为外部资源 1是，0否"`
 }
 
 type Activity struct {
@@ -734,7 +735,7 @@ type CygxActivityLabelList struct {
 // 主题列表
 func GetActivityLabelListAll(condition, sortTime string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	activity_id,activity_type_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id,city
+	sql := `SELECT	activity_id,activity_type_id, label,temporary_label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort , yidong_activity_id,city,is_external_label
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition

services/yidong.go

@@ -281,6 +281,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 			item.ActivityTimeText = GetActivityTextTime(v.Start)
 			item.YidongActivityUrl = v.URL
 			item.ActivityJoinType = v.ActivityJoinType
+			item.IsExternalLabel = 1
 			detailYidng, err := GetYiDongActivityDetail(v.ID)
 			if err != nil {
 				return err
@@ -323,6 +324,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 					updateParams["ActivityJoinType"] = item.ActivityJoinType
 					updateParams["YidongSignUpStart"] = item.YidongSignUpStart
 					updateParams["YidongSignUpEnd"] = item.YidongSignUpEnd
+					updateParams["IsExternalLabel"] = 1
 					updateParams["LastUpdatedTime"] = time.Now()
 					whereParam := map[string]interface{}{"yidong_activity_id": item.YidongActivityId}
 					err = models.UpdateByExpr(models.CygxActivity{}, whereParam, updateParams)