From fc29cf8adc44aafe9fec042b3b93620f2f822d55 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 10 Apr 2019 17:36:12 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E7=BE=8E=E5=9B=A2=E5=A4=96=E5=8D=96SyncSto?= =?UTF-8?q?reSkus=E4=B8=AD=EF=BC=8C=E5=8F=AA=E5=A4=84=E7=90=86=E4=B8=8E?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=9A=84skuIDs=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/store_sku.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go index ddbbd63bc..0660fefe5 100644 --- a/business/partner/purchase/mtwm/store_sku.go +++ b/business/partner/purchase/mtwm/store_sku.go @@ -97,7 +97,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t // 远程无，本地有，映射无， --> 添加本地 // 远程无，本地有，映射有， --> 同步标记改为新增 // hint，如果是异步，返回的是任务ID，如果是同步，返回是本次需要同步的目录数 -func (p *PurchaseHandler) SyncLocalStoreCategory(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, isCheckRemote bool) (hint string, err error) { +func (p *PurchaseHandler) SyncLocalStoreCategory(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, isCheckRemote bool, skuIDs []int) (hint string, err error) { globals.SugarLogger.Debugf("mtwm SyncLocalStoreCategory storeID:%d, userName:%s", storeID, ctx.GetUserName()) if db == nil { db = dao.GetDB() @@ -105,7 +105,7 @@ func (p *PurchaseHandler) SyncLocalStoreCategory(ctx *jxcontext.Context, db *dao catMap := make([]map[string]*dao.SkuStoreCatInfo, 2) for i := 0; i < 2; i++ { catMap[i] = make(map[string]*dao.SkuStoreCatInfo) - localCats, err := dao.GetSkusCategories(db, model.VendorIDMTWM, storeID, nil, i+1) + localCats, err := dao.GetSkusCategories(db, model.VendorIDMTWM, storeID, skuIDs, i+1) // globals.SugarLogger.Debug(utils.Format4Output(localCats, false)) if err != nil { return "", err @@ -216,7 +216,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks globals.SugarLogger.Debugf("mtwm SyncStoreSkus storeID:%d, skuIDs:%v, isContinueWhenError:%t, userName:%s", storeID, skuIDs, isContinueWhenError, ctx.GetUserName()) db := dao.GetDB() for i := 0; i < 3; i++ { // 最多重试三次 - if hint, err = p.SyncLocalStoreCategory(ctx, db, storeID, false); err != nil { + if hint, err = p.SyncLocalStoreCategory(ctx, db, storeID, false, skuIDs); err != nil { return "", err } if hint != "0" { @@ -335,7 +335,7 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t _, err = dao.SetStoreCategorySyncStatus(db, model.VendorIDMTWM, storeID, nil, model.SyncFlagNewMask) } case 3: - _, err = p.SyncLocalStoreCategory(ctx, db, storeID, true) + _, err = p.SyncLocalStoreCategory(ctx, db, storeID, true, nil) case 4: _, err = p.SyncStoreCategory(ctx, rootTask, storeID, false) case 5: