liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+Act.OverlapRule

Browse Source
This commit is contained in:
gazebo
2020-01-07 15:17:08 +08:00
parent 26ca0bc01d
commit a69b5b3772
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/act/act.go
View File

@@ -167,7 +167,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
storeIDs := jxutils.IntMap2List(storeIDMap) storeIDs := jxutils.IntMap2List(storeIDMap)
skuIDs := jxutils.IntMap2List(skuIDMap) skuIDs := jxutils.IntMap2List(skuIDMap)
// 判断活动是否重叠的检查，当前忽略京东平台及所有结算信息 // 判断活动是否重叠的检查，当前忽略京东平台及所有结算信息
if !(len(vendorIDs) == 1 && vendorIDs[0] == model.VendorIDJD || act.Type == model.ActSkuFake) { if act.OverlapRule == model.OverlapRuleNormal {
effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, act.Type, storeIDs, skuIDs, act.BeginAt, act.EndAt) effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, act.Type, storeIDs, skuIDs, act.BeginAt, act.EndAt)
if err != nil { if err != nil {
globals.SugarLogger.Errorf("GetEffectiveActStoreSkuInfo can not get sku promotion info for error:%v", err) globals.SugarLogger.Errorf("GetEffectiveActStoreSkuInfo can not get sku promotion info for error:%v", err)

4
business/model/act.go
View File

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