From fcf8d768f9c2ae7c3f5e3af1dc50f1055123e6de Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 3 Jun 2019 14:11:35 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=B4=E6=97=B6=E4=BC=91=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=98=AF1,0,-1=E6=94=B9=E4=B8=BA1,0,-1,-2=20?= =?UTF-8?q?-=20=E7=A6=81=E7=94=A8=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/storeman.go | 1 + business/model/store.go | 8 +++++--- business/partner/purchase/ebai/ebai.go | 2 +- business/partner/purchase/ebai/store.go | 4 ++-- business/partner/purchase/jd/jd.go | 4 ++-- business/partner/purchase/mtwm/mtwm.go | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/storeman.go b/business/jxstore/cms/storeman.go index 1dd9b8cce..0d17f7789 100644 --- a/business/jxstore/cms/storeman.go +++ b/business/jxstore/cms/storeman.go @@ -21,6 +21,7 @@ func init() { } func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) { + return err globals.SugarLogger.Debugf("OnStoreStatusChanged venvendorStoreID:%s, storeStatus:%d", vendorStoreID, storeStatus) db := dao.GetDB() storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID) diff --git a/business/model/store.go b/business/model/store.go index 5082f3f58..964313ac6 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -2,8 +2,9 @@ package model const ( StoreStatusAll = -9 - StoreStatusDisabled = -1 - StoreStatusClosed = 0 + StoreStatusDisabled = -2 + StoreStatusClosed = -1 + StoreStatusHaveRest = 0 StoreStatusOpened = 1 ) @@ -32,7 +33,8 @@ const ( var ( StoreStatusName = map[int]string{ StoreStatusDisabled: "禁用", - StoreStatusClosed: "休息", + StoreStatusClosed: "长期休息", + StoreStatusHaveRest: "临时休息", StoreStatusOpened: "营业中", } DeliveryRangeTypeName = map[int]string{ diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index 6dabb5db1..4990e962c 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -27,7 +27,7 @@ func init() { func EbaiBusStatus2JxStatus(ebaiStatus int) int { if ebaiStatus == ebaiapi.ShopBusStatusHaveRest || ebaiStatus == ebaiapi.ShopBusStatusSuspended { - return model.StoreStatusClosed + return model.StoreStatusHaveRest } return model.StoreStatusOpened } diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 240aec94b..0b275bc2f 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -184,7 +184,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if store2.Status != mergeStatus { if mergeStatus == model.StoreStatusOpened { err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(store.VendorStoreID)) - } else if mergeStatus == model.StoreStatusClosed { + } else if mergeStatus == model.StoreStatusHaveRest || mergeStatus == model.StoreStatusClosed { err = api.EbaiAPI.ShopClose("", utils.Str2Int64(store.VendorStoreID)) } else if mergeStatus == model.StoreStatusDisabled { err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID)) @@ -415,7 +415,7 @@ func (c *PurchaseHandler) onShopMsgPush(msg *ebaiapi.CallbackMsg) (response *eba if int(utils.ForceInterface2Int64(msg.Body["business_ele"])) == 1 { storeStatus = model.StoreStatusOpened } else { - storeStatus = model.StoreStatusClosed + storeStatus = model.StoreStatusHaveRest } } if err == nil { diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go index 45490f29a..be462ff12 100644 --- a/business/partner/purchase/jd/jd.go +++ b/business/partner/purchase/jd/jd.go @@ -42,7 +42,7 @@ func JdStoreStatus2JxStatus(yn, closeStatus interface{}) int { if yn2 == 1 { return model.StoreStatusDisabled } else if closeStatus2 == 1 { - return model.StoreStatusClosed + return model.StoreStatusHaveRest } return model.StoreStatusOpened } @@ -51,7 +51,7 @@ func JxStoreStatus2JdStatus(status int) (yn, closeStatus int) { switch status { case model.StoreStatusDisabled: return 1, 1 - case model.StoreStatusClosed: + case model.StoreStatusHaveRest, model.StoreStatusClosed: return 0, 1 default: return 0, 0 diff --git a/business/partner/purchase/mtwm/mtwm.go b/business/partner/purchase/mtwm/mtwm.go index d26bcc6ec..14a80b4d7 100644 --- a/business/partner/purchase/mtwm/mtwm.go +++ b/business/partner/purchase/mtwm/mtwm.go @@ -129,7 +129,7 @@ func bizStatusMtwm2JX(openLevel, online int) int { return model.StoreStatusDisabled } else { if openLevel == mtwmapi.PoiOpenLevelHaveRest { - return model.StoreStatusClosed + return model.StoreStatusHaveRest } } return model.StoreStatusOpened @@ -138,7 +138,7 @@ func bizStatusMtwm2JX(openLevel, online int) int { func bizStatusJX2Mtwm(status int) (openLevel, online int) { if status == model.StoreStatusDisabled { return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOffline - } else if status == model.StoreStatusClosed { + } else if status == model.StoreStatusHaveRest || status == model.StoreStatusClosed { return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOnline } return mtwmapi.PoiOpenLevelNormal, mtwmapi.PoiStatusOnline