已取消报名的活动不在列表中展示

controllers/activity_special.go

@@ -334,13 +334,11 @@ func (this *ActivitySpecialCoAntroller) Tripcancel() {
 	if time.Now().Add(+time.Hour * 48).After(resultTime) {
 		isValid = 1
 	}
-	if isValid == 0 {
-		err = models.CancelActivitySpecialTripIsValid(isValid, activityInfo.ActivityId, uid)
-		if err != nil {
-			br.Msg = "操作失败"
-			br.ErrMsg = "CancelActivitySpecialTrip,Err:" + err.Error()
-			return
-		}
+	err = models.CancelActivitySpecialTripIsValid(isValid, activityInfo.ActivityId, uid)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "CancelActivitySpecialTrip,Err:" + err.Error()
+		return
 	}
 	br.Ret = 200
 	br.Success = true

services/activity_my_schedule.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
@@ -15,7 +14,7 @@ func GetScheduleAndSpecilList(user *models.WxUserItem, condition string, startSi
 	var pars, parsSpecil []interface{}
 	condition += ` AND my.user_id = ?`
 	pars = append(pars, user.UserId)
-	conditionSpecil += ` AND my.user_id = ?`
+	conditionSpecil += ` AND my.user_id = ? AND my.is_cancel = 0 `
 	parsSpecil = append(parsSpecil, user.UserId)
 	list, e := models.GetScheduleAndSpecilList(condition, pars, conditionSpecil, parsSpecil, startSize, pageSize)
 	if e != nil {
@@ -107,7 +106,6 @@ func GetScheduleAndSpecilList(user *models.WxUserItem, condition string, startSi
 					list[k].ActiveState = strconv.Itoa(2)
 				}
 			}
-			fmt.Println(list[k].ActiveState)
 		}
 	}
 	items = list

services/activity_special.go

@@ -471,6 +471,7 @@ func HandleActivitySpecialShow(activityDetail *models.CygxActivitySpecialDetail,
 		activityDetail.TripStatus = 1
 	} else {
 		activityDetail.TripStatus = 2
+		activityDetail.TripImgLink = activityDetail.TripImgLinkFix
 	}
 	if _, ok := UserMap[activityDetail.ActivityId]; ok {
 		activityDetail.IsTrip = 1