From 5ec12fbbf17aefebfef131f5516bb701486f8887 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 11 Oct 2018 16:11:48 +0800 Subject: [PATCH] - fix some store to stores. --- business/jxstore/cms/sync.go | 2 +- business/partner/partner.go | 4 ++-- business/partner/purchase/ebai/store_sku.go | 2 +- business/partner/purchase/ebai/store_sku_test.go | 2 +- business/partner/purchase/elm/store_sku.go | 2 +- business/partner/purchase/jd/store_sku.go | 2 +- controllers/cms_store_sku.go | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index ee886e465..302294611 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -163,7 +163,7 @@ func (v *VendorSync) SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, err = v.LoopStoreVendors(db, "SyncStoresSkus", userName, func(batchItemList []interface{}, params ...interface{}) (interface{}, error) { vendorID := batchItemList[0].(int) if handler := GetPurchaseHandler(vendorID); handler != nil { - err = handler.SyncStoreSkus(db, storeIDs, skuIDs, isForce, userName) + err = handler.SyncStoresSkus(db, storeIDs, skuIDs, isForce, userName) } return nil, err }) diff --git a/business/partner/partner.go b/business/partner/partner.go index ffd7b6bce..bb3736cc4 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -75,7 +75,7 @@ type IPurchasePlatformHandler interface { // OpenStore(vendorStoreID string, userName string) error // CloseStore(vendorStoreID, closeNotice, userName string) error - SyncStoreSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isSync bool, userName string) (err error) + SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isSync bool, userName string) (err error) GetFieldIDName() string GetFieldSyncStatusName() string @@ -102,7 +102,7 @@ type IMultipleStoresHandler interface { type ISingleStoreHandler interface { IPurchasePlatformHandler - SyncStoreCategories(db *dao.DaoDB, storeIDs []int, userName string) (err error) + SyncStoresCategories(db *dao.DaoDB, storeIDs []int, userName string) (err error) ReadStoreCategories(storeID int) (cats []*model.SkuCategory, err error) ReadStoreSku(storeID, skuID int) (skuNameExt *model.SkuNameExt, err error) diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index e7eae5c42..071d78c8a 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -71,7 +71,7 @@ var ( } ) -func (p *PurchaseHandler) SyncStoreSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isSync bool, userName string) (err error) { +func (p *PurchaseHandler) SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isSync bool, userName string) (err error) { for _, storeID := range storeIDs { err = p.syncOneStoreSkus(db, storeID, skuIDs, isSync, userName) if err != nil { diff --git a/business/partner/purchase/ebai/store_sku_test.go b/business/partner/purchase/ebai/store_sku_test.go index 9f81c6532..1bcc70445 100644 --- a/business/partner/purchase/ebai/store_sku_test.go +++ b/business/partner/purchase/ebai/store_sku_test.go @@ -10,7 +10,7 @@ import ( func TestSyncStoreSkus(t *testing.T) { db := dao.GetDB() - err := new(PurchaseHandler).SyncStoreSkus(db, []int{100077}, []int{7}, false, "autotest") + err := new(PurchaseHandler).SyncStoresSkus(db, []int{100077}, []int{7}, false, "autotest") if err != nil { t.Fatal(err.Error()) } diff --git a/business/partner/purchase/elm/store_sku.go b/business/partner/purchase/elm/store_sku.go index 015b5e187..4742f29d2 100644 --- a/business/partner/purchase/elm/store_sku.go +++ b/business/partner/purchase/elm/store_sku.go @@ -16,6 +16,6 @@ func (p *PurchaseHandler) ReadStoreSku(storeID, skuID int) (skuNameExt *model.Sk return nil, nil } -func (p *PurchaseHandler) SyncStoreSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isSync bool, userName string) (err error) { +func (p *PurchaseHandler) SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isSync bool, userName string) (err error) { return nil } diff --git a/business/partner/purchase/jd/store_sku.go b/business/partner/purchase/jd/store_sku.go index 12a8baf20..f28866eff 100644 --- a/business/partner/purchase/jd/store_sku.go +++ b/business/partner/purchase/jd/store_sku.go @@ -22,7 +22,7 @@ type tStoreSkuBindExt struct { } // 京东到家，以有库存表示关注（认领） -func (p *PurchaseHandler) SyncStoreSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isForce bool, userName string) (err error) { +func (p *PurchaseHandler) SyncStoresSkus(db *dao.DaoDB, storeIDs []int, skuIDs []int, isForce bool, userName string) (err error) { parallelCount := 1 if len(skuIDs) < MaxSkuBatchSize { parallelCount = 10 diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go index 92a9bf147..ab98ce97e 100644 --- a/controllers/cms_store_sku.go +++ b/controllers/cms_store_sku.go @@ -84,9 +84,9 @@ func (c *StoreSkuController) UpdateStoreSkus() { // @Param skuIDs formData string false "SKU ID列表，缺省为全部" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult -// @router /SyncStoreSkus [put] -func (c *StoreSkuController) SyncStoreSkus() { - c.callSyncStoreSkus(func(params *tStoreSkuSyncStoreSkusParams) (retVal interface{}, errCode string, err error) { +// @router /SyncStoresSkus [put] +func (c *StoreSkuController) SyncStoresSkus() { + c.callSyncStoresSkus(func(params *tStoreSkuSyncStoresSkusParams) (retVal interface{}, errCode string, err error) { db := dao.GetDB() var storeIDs []int var skuIDs []int @@ -95,7 +95,7 @@ func (c *StoreSkuController) SyncStoreSkus() { err = utils.UnmarshalUseNumber([]byte(params.SkuIDs), &skuIDs) } if err == nil { - err = basesch.FixedBaseScheduler.GetPurchasePlatformFromVendorID(params.VendorID).SyncStoreSkus(db, storeIDs, skuIDs, params.IsSync, GetUserNameFromToken(params.Token)) + err = basesch.FixedBaseScheduler.GetPurchasePlatformFromVendorID(params.VendorID).SyncStoresSkus(db, storeIDs, skuIDs, params.IsSync, GetUserNameFromToken(params.Token)) } } return retVal, "", err