浏览代码

bug修改

wangfei 6 年前
父节点
当前提交
95d059c02c
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5
    1
      models/luckdraw/luckdraw.go
  2. 1
    0
      models/model/ta_luckdraw_record.go

+ 5
- 1
models/luckdraw/luckdraw.go 查看文件

439
 	if err != nil {
439
 	if err != nil {
440
 		return nil, nil, nil, errors.New("获取抽奖信息失败!")
440
 		return nil, nil, nil, errors.New("获取抽奖信息失败!")
441
 	}
441
 	}
442
-	if luckdraw.Status == models.STATUS_READY || time.Now().Before(luckdraw.BeginDate) {
442
+	if luckdraw.Status == models.STATUS_READY {
443
+		return nil, nil, nil, errors.New("活动已结束!")
444
+	}
445
+	if time.Now().Before(luckdraw.BeginDate) {
443
 		return nil, nil, nil, errors.New("活动还未开始!")
446
 		return nil, nil, nil, errors.New("活动还未开始!")
444
 	}
447
 	}
445
 	if luckdraw.Status == models.STATUS_EXPIRE || time.Now().After(luckdraw.EndDate) {
448
 	if luckdraw.Status == models.STATUS_EXPIRE || time.Now().After(luckdraw.EndDate) {
542
 	record.UserName = user.CustomerName
545
 	record.UserName = user.CustomerName
543
 	record.UserHeadImg = user.Headimgurl
546
 	record.UserHeadImg = user.Headimgurl
544
 	record.LuckdrawId = luckdraw.Id
547
 	record.LuckdrawId = luckdraw.Id
548
+	record.IsReality = prize.IsReality
545
 
549
 
546
 	if prize.IsReality != models.BOOL_FALSE {
550
 	if prize.IsReality != models.BOOL_FALSE {
547
 		if prize.ValidDays > 0 {
551
 		if prize.ValidDays > 0 {

+ 1
- 0
models/model/ta_luckdraw_record.go 查看文件

9
 	LuckdrawId        string    `xorm:"VARCHAR(64)"`
9
 	LuckdrawId        string    `xorm:"VARCHAR(64)"`
10
 	PrizeId           string    `xorm:"VARCHAR(64)"`
10
 	PrizeId           string    `xorm:"VARCHAR(64)"`
11
 	PrizeName         string    `xorm:"VARCHAR(50)"`
11
 	PrizeName         string    `xorm:"VARCHAR(50)"`
12
+	IsReality         int       `xorm:"SMALLINT(6)"`
12
 	UserId            string    `xorm:"VARCHAR(64)"`
13
 	UserId            string    `xorm:"VARCHAR(64)"`
13
 	UserName          string    `xorm:"VARCHAR(50)"`
14
 	UserName          string    `xorm:"VARCHAR(50)"`
14
 	UserHeadImg       string    `xorm:"TEXT"`
15
 	UserHeadImg       string    `xorm:"TEXT"`