From 527742afbe2e6787a499f310394dac3faf6638c7 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 18 Jul 2019 14:28:09 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AF=B9=E4=BA=8E=E5=8D=95=E4=BA=AC?= =?UTF-8?q?=E4=B8=9C=E5=B9=B3=E5=8F=B0=E6=B4=BB=E5=8A=A8=E4=B8=8D=E5=81=9A?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=86=B2=E7=AA=81=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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)