fix

models/activity.go

@@ -138,6 +138,7 @@ type ActivityDetail struct {
 	TripImgLink             string                     `description:"专项产业调研行程链接"`
 	ActivityTimeEnd         string                     `description:"专项产业调研活动预期结束时间"`
 	AuthInfo                *UserPermissionAuthInfo    `description:"用户查看视频的权限"`
+	Days                    int                        `description:"调研天数"`
 }
 
 //活动详情
@@ -199,6 +200,10 @@ type ActivityListResp struct {
 	Listndustrial           []*IndustrialManagementRep `description:"活动关联的产业信息"`
 	AuthInfo                *UserPermissionAuthInfo    `description:"用户查看视频的权限"`
 	Explain                 string                     `description:"活动右上角提示"`
+	TripImgLink             string                     `description:"专项产业调研行程链接"`
+	IsTrip                  int                        `description:"是否报名 1是 ，0 否"`
+	TripStatus              int                        `description:"行程进行状态 1：预报名，2：确定行程"`
+	Days                    int                        `description:"调研天数"`
 }
 
 type ActivityArticleResp struct {
@@ -463,7 +468,8 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.activity_type_id,
 			art.limit_people_num,
 			1 AS source_type,
-			art.activity_time 
+			art.activity_time,
+			0 AS days 
 		FROM
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
@@ -493,7 +499,8 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			"",
 			"",
 			2 AS source_type,
-			art.activity_time 
+			art.activity_time,
+			art.days 	
 		FROM
 			cygx_activity_special AS art
 			INNER JOIN cygx_activity_special_trip AS my ON my.activity_id = art.activity_id 

services/activity.go

@@ -517,6 +517,27 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem) (i
 		YidongActivityUrl:       yidongActivityUrl,
 		AuthInfo:                v.AuthInfo,
 		Explain:                 utils.ACtIVITY_SPECIAL_EXPLAIN,
+		TripImgLink:             v.TripImgLink,
+		Days:                    v.Days,
+	}
+	//处理用户已经报名了的行程
+	var activityIds []int
+	activityIds = append(activityIds, v.ActivityId)
+	UserMap, e := GetSpecialTripUserMap(activityIds, user.UserId)
+	if e != nil {
+		e = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
+		return
+	}
+	if _, ok := UserMap[v.ActivityId]; ok {
+		itemActivity.IsTrip = 1
+	}
+	if itemActivity.Days == 0 {
+		itemActivity.TripStatus = 1
+		//activityDetail.Explain = utils.ACtIVITY_SPECIAL_EXPLAIN
+	} else {
+		itemActivity.TripStatus = 2
+		//itemActivity.TripImgLink = itemActivity.TripImgLinkFix
+		//activityDetail.Explain = utils.ACtIVITY_SPECIAL_TRIP_EXPLAIN
 	}
 	return
 }