From 0331e704e0978c350d80d34ced56c7c5e58c11e9 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 1 Sep 2019 15:27:06 +0800 Subject: [PATCH] =?UTF-8?q?+=20IPurchasePlatformHandler.UpdateStoreCustomI?= =?UTF-8?q?D=20-=20=E5=88=A0=E9=99=A4=E5=B9=B3=E5=8F=B0=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B0=86=E5=B9=B3=E5=8F=B0=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=9A=84CUSTOMID=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=85=B6=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0ID=E6=9C=AC=E8=BA=AB=20-=20=E9=A5=BF=E4=BA=86=E4=B9=88?= =?UTF-8?q?=E4=B8=8E=E5=BE=AE=E5=95=86=E5=9F=8Ehandler=E4=B8=8D=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 21 ++++++++++++--------- business/partner/partner.go | 1 + business/partner/purchase/ebai/store.go | 9 ++++++++- business/partner/purchase/elm/elm.go | 2 +- business/partner/purchase/jd/store.go | 9 +++++++++ business/partner/purchase/mtwm/store.go | 4 ++++ business/partner/purchase/weimob/wsc/wsc.go | 2 +- 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 74f1baf65..ca396b0c0 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -872,15 +872,18 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor if db == nil { db = dao.GetDB() } - storeMap := &model.StoreMap{} - if num, err = dao.DeleteEntityLogically(db, storeMap, map[string]interface{}{ - model.FieldSyncStatus: model.SyncFlagDeletedMask, - model.FieldStatus: model.StoreStatusDisabled, - }, userName, map[string]interface{}{ - model.FieldStoreID: storeID, - model.FieldVendorID: vendorID, - }); err == nil && num > 0 { - _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) + storeMap := &model.StoreMap{ + StoreID: storeID, + VendorID: vendorID, + } + storeMap.DeletedAt = utils.DefaultTimeValue + if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err == nil { + if handler := partner.GetPurchasePlatformFromVendorID(vendorID); handler != nil { + handler.UpdateStoreCustomID(ctx, storeMap.VendorStoreID, utils.Str2Int64WithDefault(storeMap.VendorStoreID, 0)) + } + num, err = dao.DeleteEntityLogically(db, storeMap, map[string]interface{}{ + model.FieldStatus: model.StoreStatusDisabled, + }, userName, nil) } return num, err } diff --git a/business/partner/partner.go b/business/partner/partner.go index 7549216d2..803ceb747 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -142,6 +142,7 @@ type IPurchasePlatformHandler interface { ReadStore(ctx *jxcontext.Context, vendorStoreID string) (store *dao.StoreDetail, err error) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) GetStoreStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeStatus int, err error) + UpdateStoreCustomID(ctx *jxcontext.Context, vendorStoreID string, storeID int64) (err error) // EnableAutoAcceptOrder(vendorStoreID string, isEnabled bool) error // OpenStore(vendorStoreID string, userName string) error // CloseStore(vendorStoreID, closeNotice, userName string) error diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index f34187abb..b78d81846 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -171,7 +171,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } if err == nil { if shopID > 0 { - err = api.EbaiAPI.ShopIDBatchUpdate([]string{store.VendorStoreID}, []string{utils.Int2Str(shopID)}) + err = p.UpdateStoreCustomID(jxcontext.AdminCtx, store.VendorStoreID, int64(shopID)) } else if shopID == 0 { // todo remove out shop id } @@ -486,3 +486,10 @@ func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context) (vendorSt } return vendorStoreIDs, err } + +func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorStoreID string, storeID int64) (err error) { + if globals.EnableJdStoreWrite { + err = api.EbaiAPI.ShopIDBatchUpdate([]string{vendorStoreID}, []string{utils.Int64ToStr(storeID)}) + } + return err +} diff --git a/business/partner/purchase/elm/elm.go b/business/partner/purchase/elm/elm.go index 8953ded51..d20aeb816 100644 --- a/business/partner/purchase/elm/elm.go +++ b/business/partner/purchase/elm/elm.go @@ -23,7 +23,7 @@ type PurchaseHandler struct { func init() { if api.ElmAPI != nil { curPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(curPurchaseHandler) + // partner.RegisterPurchasePlatform(curPurchaseHandler) } } diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index a15edc62c..86f08f361 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -462,3 +462,12 @@ func (c *PurchaseHandler) SyncQualify(ctx *jxcontext.Context, storeDetail *dao.S } return addStoreInfo2Err(err, storeDetail.ID) } + +func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorStoreID string, storeID int64) (err error) { + if globals.EnableJdStoreWrite { + err = getAPI("").UpdateStoreInfo4Open(vendorStoreID, ctx.GetUserName(), map[string]interface{}{ + jdapi.KeyOutSystemId: utils.Int64ToStr(storeID), + }) + } + return err +} diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 9e7491c06..64e34366d 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -255,3 +255,7 @@ func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context) (vendorSt vendorStoreIDs, err = api.MtwmAPI.PoiGetIDs() return vendorStoreIDs, err } + +func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorStoreID string, storeID int64) (err error) { + return err +} diff --git a/business/partner/purchase/weimob/wsc/wsc.go b/business/partner/purchase/weimob/wsc/wsc.go index c5bbc4e31..3aef77cb8 100644 --- a/business/partner/purchase/weimob/wsc/wsc.go +++ b/business/partner/purchase/weimob/wsc/wsc.go @@ -26,7 +26,7 @@ type PurchaseHandler struct { func init() { if api.WeimobAPI != nil { curPurchaseHandler = new(PurchaseHandler) - partner.RegisterPurchasePlatform(curPurchaseHandler) + // partner.RegisterPurchasePlatform(curPurchaseHandler) } }