diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index e3fbb5056..8a759c346 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -81,13 +81,15 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac } storeIDs := jxutils.IntMap2List(storeIDMap) skuIDs := jxutils.IntMap2List(skuIDMap) - effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, storeIDs, skuIDs, act.BeginAt, act.EndAt) - if err != nil { - 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(vendorIDs) == 1 && vendorIDs[0] == model.VendorIDJD) { + effectActStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, vendorIDs, storeIDs, skuIDs, act.BeginAt, act.EndAt) + if err != nil { + 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) + } } storeSkuList, err2 := dao.GetStoresSkusInfo(db, storeIDs, skuIDs)