+Act.OverlapRule

business/model/act.go

@@ -28,6 +28,9 @@ const (
 	ActCreateTypeAPI      = 1
 	ActCreateTypeCallback = 2
 	ActCreateTypeSpider   = 3
+
+	OverlapRuleNormal  = 0 // 不允许重叠（重叠会报错）
+	OverlapRuleReplace = 1 // 相同活动类型，或秒杀替换直降
 )
 
 var (
@@ -63,6 +66,7 @@ type Act struct {
 	LimitCount      int       `json:"limitCount"` // 每单限购数量
 	Source          string    `orm:"size(255)" json:"source"`
 	CreateType      int       `json:"createType"`
+	OverlapRule     int       `json:"overlapRule"`
 	PricePercentage int       `json:"pricePercentage"` // 单品级活动才有效
 	BeginAt         time.Time `orm:"type(datetime);index" json:"beginAt"`
 	EndAt           time.Time `orm:"type(datetime);index" json:"endAt"`