From 07f8b120f8e6fa6e4aca79dd7fc8a8147695f7be Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 11 Jun 2019 21:04:58 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AF=B9=E4=BA=8E=E9=A5=BF=E7=99=BE?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=AE=BE=E7=BD=AE=E9=97=A8=E5=BA=97=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=AF=E5=90=A6=E4=B8=80=E8=87=B4=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=A6=81=E5=B0=86StoreStatusClosed=E4=B8=8EStoreStatu?= =?UTF-8?q?sHaveRest=E5=BD=93=E6=88=90=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index b3c10dec8..24139cc20 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -181,7 +181,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } if err == nil { mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus) - if store2.Status != mergeStatus { + if !isStoreStatusSame(store2.Status, mergeStatus) { if mergeStatus == model.StoreStatusOpened { err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(store.VendorStoreID)) } else if mergeStatus == model.StoreStatusHaveRest || mergeStatus == model.StoreStatusClosed { @@ -214,6 +214,16 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin return err } +func isStoreStatusSame(status1, status2 int) bool { + if status1 == model.StoreStatusClosed { + status1 = model.StoreStatusHaveRest + } + if status2 == model.StoreStatusClosed { + status2 = model.StoreStatusHaveRest + } + return status1 == status2 +} + func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) { globals.SugarLogger.Debugf("ebai RefreshAllStoresID") const batchSize = 50