Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

models/model/ta_luckdraw_tpl.go

@@ -3,6 +3,7 @@ package model
 type TaLuckdrawTpl struct {
 	TplId   string `xorm:"not null VARCHAR(128)"`
 	TplImg  string `xorm:"TEXT"`
+	MiniPic string `xorm:"TEXT"`
 	Status  int    `xorm:"SMALLINT(6)"`
 	OrgId   string `xorm:"VARCHAR(64)"`
 	TplName string `xorm:"VARCHAR(50)"`

service/flashbuy/flashbuy.go

@@ -198,13 +198,13 @@ func (s *FlashBuyServ) FlashBuy(id string) error {
 		utils.LogError("获取抢购活动信息失败: " + err.Error())
 		return errors.New("获取抢购活动信息失败！")
 	}
-	if flashbuy.Status == models.STATUS_NORMAL {
+	if flashbuy.Status != models.STATUS_NORMAL {
 		return errors.New("抢购活动状态异常！")
 	}
-	if flashbuy.FlashBuyStatus == "" || time.Now().After(flashbuy.EndDate) {
+	if time.Now().After(flashbuy.EndDate) {
 		return errors.New("活动已结束！")
 	}
-	if flashbuy.FlashBuyStatus == models.FLASH_BUY_INACTIVE {
+	if flashbuy.FlashBuyStatus != models.FLASH_BUY_ACTIVE {
 		return errors.New("活动已停用！")
 	}
 	if time.Now().Before(flashbuy.StartDate) {