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

business/jxstore/act/act.go

@@ -81,6 +81,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 		}
 		storeIDs := jxutils.IntMap2List(storeIDMap)
 		skuIDs := jxutils.IntMap2List(skuIDMap)
+		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)
@@ -89,6 +90,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 			if len(effectActStoreSkuList) > 0 {
 				return nil, nil, nil, jsonerr.New(effectActStoreSkuList, model.ErrCodeJsonActSkuConflict)
 			}
+		}
 
 		storeSkuList, err2 := dao.GetStoresSkusInfo(db, storeIDs, skuIDs)
 		if err = err2; err != nil {