未开始活动不展示

service/activityServiceNew.go

@@ -456,7 +456,7 @@ func (service *ActivityServiceNew) GetAllLottery(in *activity.Request) (int64, s
 	err = orm.Table("activity").Alias("a").Select(" DISTINCT a.*").
 		Join("left", "discount d", "d.activityId = a.id").
 		Join("left", "product p", "FIND_IN_SET(p.productCode,d.useProductList)").
-		Where(" a.state=1  and if ( (a.preheatingTime IS NULL or a.preheatingTime='' )  , a.beginDate<now() ,a.preheatingTime<now())  and a.endDate>=now() and (p.productCode=? or p.parentCode=?)", in.ProductCode, in.ProductCode).Find(&activityList)
+		Where(" a.state=1  and   a.beginDate<now()  and a.endDate>=now() and (p.productCode=? or p.parentCode=?)", in.ProductCode, in.ProductCode).Find(&activityList)
 	if len(activityList) == 0 {
 		return entity.ErrorCode, "当前时段没有活动可以参加", []entity.Activity{}
 	}