bug修改

models/luckdraw/luckdraw.go

@@ -439,7 +439,10 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	if err != nil {
 		return nil, nil, nil, errors.New("获取抽奖信息失败！")
 	}
-	if luckdraw.Status == models.STATUS_READY || time.Now().Before(luckdraw.BeginDate) {
+	if luckdraw.Status == models.STATUS_READY {
+		return nil, nil, nil, errors.New("活动已结束！")
+	}
+	if time.Now().Before(luckdraw.BeginDate) {
 		return nil, nil, nil, errors.New("活动还未开始！")
 	}
 	if luckdraw.Status == models.STATUS_EXPIRE || time.Now().After(luckdraw.EndDate) {
@@ -542,6 +545,7 @@ func (m *LuckDrawDao) LuckDraw(id string, user *model.TaCustomer) (*model.TaLuck
 	record.UserName = user.CustomerName
 	record.UserHeadImg = user.Headimgurl
 	record.LuckdrawId = luckdraw.Id
+	record.IsReality = prize.IsReality
 
 	if prize.IsReality != models.BOOL_FALSE {
 		if prize.ValidDays > 0 {

models/model/ta_luckdraw_record.go

@@ -9,6 +9,7 @@ type TaLuckdrawRecord struct {
 	LuckdrawId        string    `xorm:"VARCHAR(64)"`
 	PrizeId           string    `xorm:"VARCHAR(64)"`
 	PrizeName         string    `xorm:"VARCHAR(50)"`
+	IsReality         int       `xorm:"SMALLINT(6)"`
 	UserId            string    `xorm:"VARCHAR(64)"`
 	UserName          string    `xorm:"VARCHAR(50)"`
 	UserHeadImg       string    `xorm:"TEXT"`