diff --git a/business/partner/partner_store.go b/business/partner/partner_store.go index 48fcaaaaf..f89951b17 100644 --- a/business/partner/partner_store.go +++ b/business/partner/partner_store.go @@ -3,6 +3,8 @@ package partner import "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" type IStoreHandler interface { + GetAllStoresVendorID(ctx *jxcontext.Context) (vendorStoreIDs []string, err error) + UpdateStoreStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, status int) (err error) // opTime格式为整数1130代表11:30 UpdateStoreOpTime(ctx *jxcontext.Context, storeID int, vendorStoreID string, opTimeList []int) (err error) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 939a2e3be..64e540018 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -572,28 +572,24 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch. } fromDate := utils.Time2Date(queryDate) toDate := fromDate.Add(24*time.Hour - 1) - var shopList []*ebaiapi.ShopInfo + var vendorStoreIDs []string if vendorStoreID == "" { - shopList, err = api.EbaiAPI.ShopList(ebaiapi.SysStatusAll) + vendorStoreIDs, err = c.GetAllStoresVendorID(ctx) if err != nil { return nil, err } } else { - shopList = []*ebaiapi.ShopInfo{ - &ebaiapi.ShopInfo{ - BaiduShopID: utils.Str2Int64(vendorStoreID), - }, - } + vendorStoreIDs = []string{vendorStoreID} } task := tasksch.NewParallelTask("ebai ListOrders", nil, ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - shop := batchItemList[0].(*ebaiapi.ShopInfo) - orderList, err := api.EbaiAPI.OrderListAll("", shop.BaiduShopID, fromDate.Unix(), toDate.Unix(), 0) + vendorStoreID := batchItemList[0].(string) + orderList, err := api.EbaiAPI.OrderListAll("", utils.Str2Int64(vendorStoreID), fromDate.Unix(), toDate.Unix(), 0) if err == nil { retVal = orderList } return retVal, err - }, shopList) + }, vendorStoreIDs) tasksch.HandleTask(task, parentTask, true).Run() orderList, err := task.GetResult(0) if err == nil && len(orderList) > 0 { diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 76a931c0a..0a7a532a2 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -465,3 +465,14 @@ func (c *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, storeID int, } return err } + +func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context) (vendorStoreIDs []string, err error) { + shopList, err := api.EbaiAPI.ShopList(ebaiapi.SysStatusAll) + if err == nil && len(shopList) > 0 { + vendorStoreIDs = make([]string, len(shopList)) + for k, v := range shopList { + vendorStoreIDs[k] = utils.Int64ToStr(v.BaiduShopID) + } + } + return vendorStoreIDs, err +} diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index e4346961c..ae131099a 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -184,13 +184,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin // } /////////////////////// -func (p *PurchaseHandler) GetAllStoreIDsFromRemote() ([]string, error) { - result, err := api.JdAPI.GetStationsByVenderId() - return result, err -} - func (p *PurchaseHandler) GetAllStoresFromRemote() ([]*model.Store, error) { - ids, err := p.GetAllStoreIDsFromRemote() + ids, err := p.GetAllStoresVendorID(jxcontext.AdminCtx) if err == nil { retVal := make([]*model.Store, len(ids)) for index, id := range ids { @@ -355,3 +350,8 @@ func (c *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, storeID int, } return err } + +func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context) (vendorStoreIDs []string, err error) { + vendorStoreIDs, err = api.JdAPI.GetStationsByVenderId() + return vendorStoreIDs, err +} diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 4c849397b..85a940000 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -536,7 +536,7 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch. var vendorStoreIDs []string if vendorStoreID == "" { - vendorStoreIDs, err = api.MtwmAPI.PoiGetIDs() + vendorStoreIDs, err = c.GetAllStoresVendorID(ctx) if err != nil { return nil, err } diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index b459bda20..c271aa838 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -192,3 +192,8 @@ func (c *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, storeID int, } return err } + +func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context) (vendorStoreIDs []string, err error) { + vendorStoreIDs, err = api.MtwmAPI.PoiGetIDs() + return vendorStoreIDs, err +}