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

- 对于单京东平台活动不做活动冲突检查

Browse Source
This commit is contained in:
gazebo
2019-07-18 14:28:09 +08:00
parent c7736952b3
commit 527742afbe
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,13 +81,15 @@ 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)
effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, storeIDs, skuIDs, act.BeginAt, act.EndAt) if !(len(vendorIDs) == 1 && vendorIDs[0] == model.VendorIDJD) {
if err != nil { effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, storeIDs, skuIDs, act.BeginAt, act.EndAt)
globals.SugarLogger.Errorf("updateActPrice4StoreSkuNameNew can not get sku promotion info for error:%v", err) if err != nil {
return nil, nil, nil, err globals.SugarLogger.Errorf("updateActPrice4StoreSkuNameNew can not get sku promotion info for error:%v", err)
} return nil, nil, nil, err
if len(effectActStoreSkuList) > 0 { }
return nil, nil, nil, jsonerr.New(effectActStoreSkuList, model.ErrCodeJsonActSkuConflict) if len(effectActStoreSkuList) > 0 {
return nil, nil, nil, jsonerr.New(effectActStoreSkuList, model.ErrCodeJsonActSkuConflict)
}
} }
storeSkuList, err2 := dao.GetStoresSkusInfo(db, storeIDs, skuIDs) storeSkuList, err2 := dao.GetStoresSkusInfo(db, storeIDs, skuIDs)