From 040206b63ef9082521b8643fcdb3378f1754a4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 20 May 2020 14:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 2 +- business/jxstore/cms/sync_store_sku.go | 2 +- business/model/dao/store_sku.go | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index a9f08249a..974537b6d 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1221,7 +1221,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend //绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存 //TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存 if _, err = SetStoreSkuSyncStatus2(db, nil, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil { - CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true) + // CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true) } } if globals.IsAddEvent { diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index c69c1f3cf..003685dbb 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -486,7 +486,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } else { if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { // err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID) - if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID) { + if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.Status != model.SkuStatusDontSale) { err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0) failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误") if parentTask == nil { diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index eb22702a2..c67eacea7 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -642,8 +642,6 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int sqlParams = append(sqlParams, skuIDs) } sql = fmt.Sprintf(sql, fmtParams...) - fmt.Println(sql) - fmt.Println(sqlParams) return ExecuteSQL(db, sql, sqlParams...) }