Merge branch 'ysx-魔方统计-20210112'

special/activity_statistics/main.go

@@ -91,7 +91,7 @@ func main() {
 	}
 	}
 	//先去取出所有的正在进行的活动列表
 	//先去取出所有的正在进行的活动列表
 	var giftActivityList []model.GiftActivity
 	var giftActivityList []model.GiftActivity
-	err = specialDb.Reset().Table(&giftActivityList).Fields("id,start_time,end_time").Where("status", "!=", -1).
+	err = specialDb.Reset().Table(&giftActivityList).Fields("id,start_time,end_time").
 		Where("end_time", ">", updateTime).Select()
 		Where("end_time", ">", updateTime).Select()
 	if err != nil {
 	if err != nil {
 		fmt.Println(err.Error())
 		fmt.Println(err.Error())
@@ -181,7 +181,7 @@ func main() {
 
 
 	//价格促销活动*****************
 	//价格促销活动*****************
 	var priceActivityList []model.PriceActivity
 	var priceActivityList []model.PriceActivity
-	err = specialDb.Reset().Table(&priceActivityList).Fields("id,start_time,end_time").Where("status", "!=", -1).
+	err = specialDb.Reset().Table(&priceActivityList).Fields("id,start_time,end_time").
 		Where("end_time", ">", updateTime).Select()
 		Where("end_time", ">", updateTime).Select()
 	if err != nil {
 	if err != nil {
 		fmt.Println(err.Error())
 		fmt.Println(err.Error())