xingzai 2 лет назад
Родитель
Сommit
aafd451b30
2 измененных файлов с 7 добавлено и 7 удалено
  1. 1 1
      models/activity_special.go
  2. 6 6
      services/activity_special.go

+ 1 - 1
models/activity_special.go

@@ -35,7 +35,7 @@ type CygxActivitySpecialDetail struct {
 	ActivityTimeTextByDay string `description:"活动预期时间带周日"`
 	ActivityTime          string `description:"活动预期时间"`
 	ActivityTimeEnd       string `description:"活动预期结束时间"`
-	ActiveState           int    `description:"活动进行状态 未开始:1、进行中2、已结束3"`
+	ActiveState           string `description:"活动进行状态 未开始:1、进行中2、已结束3"`
 	TripStatus            int    `description:"行程进行状态 1:预报名,2:确定行程"`
 	Explain               string `description:"说明"`
 	AdminId               int    `description:"管理员ID"`

+ 6 - 6
services/activity_special.go

@@ -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)
 	//处理用户已经报名了的行程