no message

services/resource_data.go

@@ -188,7 +188,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetCygxActivitySpecialDetailList, Err: " + e.Error())
 			return
 		}
-		UserMap, e := GetSpecialTripUserMap(activityIds, user.UserId)
+		UserMap, e := GetSpecialTripUserMap(activityspecialIds, user.UserId)
 		if e != nil {
 			err = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
 			return
@@ -196,17 +196,19 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		//fmt.Println(activitySpeciallist)
 		//fmt.Println(mapChart)
 		for _, v := range activitySpeciallist {
-			fmt.Println(v.ChartPermissionName)
 			if mapChart[v.ChartPermissionName] != "" {
 				imgUrlResp = mapChart[v.ChartPermissionName]
 			}
 			if _, ok := UserMap[v.ActivityId]; ok {
+				fmt.Println(v.ActivityId, "dfs")
 				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsTrip = 1
 			}
 			if v.Days == 0 {
 				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 1
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLink
 			} else {
 				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 2
+				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLinkFix
 			}
 			resultTimeStart := utils.StrTimeToTime(v.ActivityTime)  //时间字符串格式转时间格式
 			resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
@@ -222,13 +224,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].City = v.City
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTime = v.ActivityTime
-			if v.Days > 0 {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLinkFix
-			} else {
-				mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLink
-			}
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsSignup = v.IsSignup
-			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsTrip = v.IsTrip
 			mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ImgUrl = imgUrlResp
 		}
 	}