Merge branch 'feature/redpacket' into 'develop'

models/red_packet.go

@@ -3,6 +3,7 @@ package models
 import (
 	"bwallet/pkg/setting"
 	"github.com/jinzhu/gorm"
+	"time"
 )
 
 type RedPacket struct {
@@ -61,7 +62,7 @@ func GetRedPackets(maps interface{}) ([]*RedPacket, error) {
 func GetRedPacketsForReceive() ([]*RedPacket, error) {
 	var redPackets []*RedPacket
 	status_map := [] int{1, 2, 4}
-	if err := db.Where("status in (?)", status_map).Find(&redPackets).Error; err != nil {
+	if err := db.Where("status in (?)", status_map).Where("expire_at > (?)", time.Now().UTC().Unix()).Find(&redPackets).Error; err != nil {
 		return nil, err
 	}