From 71bd8a0c6de7a24c7692911fde27614acda80c92 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 12 Jul 2019 11:27:21 +0800 Subject: [PATCH] - up --- business/jxstore/cms/store_sku.go | 2 +- business/partner/partner.go | 3 +-- business/partner/partner_store_sku.go | 3 +++ business/partner/purchase/elm/store_sku.go | 5 ----- business/partner/purchase/jd/store_sku2.go | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index a091f2675..2df34cce6 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2073,7 +2073,7 @@ func GetVendorStoreSkusInfo(ctx *jxcontext.Context, storeID int, vendorIDs, skuI _, err = CurVendorSync.LoopStoresMap(ctx, db, fmt.Sprintf("GetVendorStoreSkusInfo storeID:%d", storeID), false, false, vendorIDs, []int{storeID}, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) { loopMapInfo := batchItemList[0].(*LoopStoreMapInfo) - if handler := CurVendorSync.GetStoreHandler(loopMapInfo.VendorID); handler != nil { + if handler, _ := partner.GetPurchasePlatformFromVendorID(loopMapInfo.VendorID).(partner.IPurchasePlatformStoreSkuHandler); handler != nil { storeSkuList, err2 := dao.GetStoreSkus2(db, loopMapInfo.VendorID, storeID, skuIDs, false) if err = err2; err == nil && len(storeSkuList) > 0 { bareStoreSkuInfoList := make([]*partner.BareStoreSkuInfo, len(skuIDs)) diff --git a/business/partner/partner.go b/business/partner/partner.go index 996ab1596..a47b3b97e 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -235,9 +235,8 @@ type IPurchasePlatformHandler interface { GetStoreStatus(ctx *jxcontext.Context, vendorStoreID string) (storeStatus int, err error) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) - // todo 如下两个函数需要合并一下s + // todo GetStoresSku应该与GetStoreSkusInfo合并 GetStoresSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) - GetStoreSkusInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*BareStoreSkuInfo) (outStoreSkuList []*BareStoreSkuInfo, err error) } // db *dao.DaoDB, diff --git a/business/partner/partner_store_sku.go b/business/partner/partner_store_sku.go index 6aa189b7f..7db4e49a3 100644 --- a/business/partner/partner_store_sku.go +++ b/business/partner/partner_store_sku.go @@ -3,6 +3,7 @@ package partner import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model/dao" ) @@ -89,6 +90,7 @@ type BareCategoryInfo struct { type IPurchasePlatformStoreSkuHandler interface { GetStoreSkusBatchSize(funcID int) int + GetStoreSkusInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*BareStoreSkuInfo) (outStoreSkuList []*BareStoreSkuInfo, err error) UpdateStoreSkusStock(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*BareStoreSkuInfo) (err error) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*BareStoreSkuInfo) (err error) UpdateStoreSkusPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*BareStoreSkuInfo) (err error) @@ -97,6 +99,7 @@ type IPurchasePlatformStoreSkuHandler interface { type ISingleStoreStoreSkuHandler interface { IPurchasePlatformStoreSkuHandler + // 这个函数与GetStoreSkusInfo的区别是GetStoreAllSkus取的是全信息，而GetStoreSkusInfo只含库存，价格与可售信息 // GetStoreAllSkus(ctx *jxcontext.Context, vendorStoreID string) (skuNameList []*SkuNameInfo, err error) CreateStoreSkus(ctx *jxcontext.Context, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (err error) UpdateStoreSkus(ctx *jxcontext.Context, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (err error) diff --git a/business/partner/purchase/elm/store_sku.go b/business/partner/purchase/elm/store_sku.go index cc9a275b3..1216104d2 100644 --- a/business/partner/purchase/elm/store_sku.go +++ b/business/partner/purchase/elm/store_sku.go @@ -4,7 +4,6 @@ import ( "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/partner" ) func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync bool) (hint string, err error) { @@ -31,10 +30,6 @@ func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksc return storeSkuList, err } -func (p *PurchaseHandler) GetStoreSkusInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*partner.BareStoreSkuInfo) (outStoreSkuList []*partner.BareStoreSkuInfo, err error) { - return outStoreSkuList, err -} - func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { return hint, err } diff --git a/business/partner/purchase/jd/store_sku2.go b/business/partner/purchase/jd/store_sku2.go index 2fdb331e7..dc07f71ea 100644 --- a/business/partner/purchase/jd/store_sku2.go +++ b/business/partner/purchase/jd/store_sku2.go @@ -41,7 +41,7 @@ func (p *PurchaseHandler) GetStoreSkusInfo(ctx *jxcontext.Context, parentTask ta stockInfo, err = api.JdAPI.QueryOpenUseable(batchSkuInfoList) } else { priceInfo, err = api.JdAPI.GetStationInfoList(vendorStoreID, batchSkuList) - globals.SugarLogger.Debug(utils.Format4Output(priceInfo, false)) + // globals.SugarLogger.Debug(utils.Format4Output(priceInfo, false)) } return nil, err }, []int{0, 1})