|
@@ -336,11 +336,11 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
|
|
|
resultTimeStart := utils.StrTimeToTime(v.ActivityTime) //时间字符串格式转时间格式
|
|
|
resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
|
|
|
if resultTimeStart.After(time.Now()) {
|
|
|
- list[k].ActiveState = 1
|
|
|
+ list[k].ActiveState = strconv.Itoa(1)
|
|
|
} else if time.Now().After(resultTimeEnd) {
|
|
|
- list[k].ActiveState = 3
|
|
|
+ list[k].ActiveState = strconv.Itoa(3)
|
|
|
} else {
|
|
|
- list[k].ActiveState = 2
|
|
|
+ list[k].ActiveState = strconv.Itoa(2)
|
|
|
}
|
|
|
if list[k].Days == 0 {
|
|
|
list[k].TripStatus = 1
|
|
@@ -502,11 +502,11 @@ func HandleActivitySpecialShow(activityDetail *models.CygxActivitySpecialDetail,
|
|
|
resultTimeStart := utils.StrTimeToTime(activityDetail.ActivityTime) //时间字符串格式转时间格式
|
|
|
resultTimeEnd := utils.StrTimeToTime(activityDetail.ActivityTimeEnd) //时间字符串格式转时间格式
|
|
|
if resultTimeStart.After(time.Now()) {
|
|
|
- activityDetail.ActiveState = 1
|
|
|
+ activityDetail.ActiveState = strconv.Itoa(1)
|
|
|
} else if time.Now().After(resultTimeEnd) {
|
|
|
- activityDetail.ActiveState = 3
|
|
|
+ activityDetail.ActiveState = strconv.Itoa(3)
|
|
|
} else {
|
|
|
- activityDetail.ActiveState = 2
|
|
|
+ activityDetail.ActiveState = strconv.Itoa(2)
|
|
|
}
|
|
|
activityIds = append(activityIds, activityDetail.ActivityId)
|
|
|
//处理用户已经报名了的行程
|