From 719579c110c29ba178973f2d1dd019ebfd71bc34 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 29 Mar 2019 12:13:36 +0800 Subject: [PATCH] =?UTF-8?q?!=20=E7=BE=8E=E5=9B=A2=E5=A4=96=E5=8D=96?= =?UTF-8?q?=E4=B8=8E=E9=A5=BF=E7=99=BE=E9=97=A8=E5=BA=97=E5=8F=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=90=A5=E4=B8=9A=E7=9B=B8=E5=85=B3=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/ebai/store.go | 7 ++-- business/partner/purchase/mtwm/mtwm.go | 8 ++-- business/partner/purchase/mtwm/store.go | 56 +++++++++++++++---------- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index a3e27e345..f81c8597f 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -201,9 +201,10 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } return err } - params := genStoreMapFromStore(store) - if err = api.EbaiAPI.ShopUpdate(params); err == nil { - } + // todo 饿百 开店审核通过后不允许修改商户信息 + // params := genStoreMapFromStore(store) + // if err = api.EbaiAPI.ShopUpdate(params); err == nil { + // } } } } diff --git a/business/partner/purchase/mtwm/mtwm.go b/business/partner/purchase/mtwm/mtwm.go index 76b97ad1a..406fcaada 100644 --- a/business/partner/purchase/mtwm/mtwm.go +++ b/business/partner/purchase/mtwm/mtwm.go @@ -122,7 +122,7 @@ func openTimeJX2Mtwm(times [][2]int16) string { } func bizStatusMtwm2JX(openLevel, online int) int { - if online == mtwmapi.PoiOffline { + if online == mtwmapi.PoiStatusOffline { return model.StoreStatusDisabled } else { if openLevel == mtwmapi.PoiOpenLevelHaveRest { @@ -134,11 +134,11 @@ func bizStatusMtwm2JX(openLevel, online int) int { func bizStatusJX2Mtwm(status int) (openLevel, online int) { if status == model.StoreStatusDisabled { - return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiOffline + return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOffline } else if status == model.StoreStatusClosed { - return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiOnline + return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOnline } - return mtwmapi.PoiOpenLevelNormal, mtwmapi.PoiOnline + return mtwmapi.PoiOpenLevelNormal, mtwmapi.PoiStatusOnline } func skuStatusJX2Mtwm(status int) int { diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index b0afbc4ae..56c0c22f6 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -12,7 +12,6 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" ) @@ -103,30 +102,45 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if err != nil { return err } - remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) - if err != nil { - return err - } + // remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + // if err != nil { + // return err + // } openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}} if storeDetail.OpenTime2 > 0 { openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2}) } - params := map[string]interface{}{ - "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), - "phone": storeDetail.Tel1, - "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), - "shipping_time": openTimeJX2Mtwm(openTime), - "third_tag_name": "蔬菜", - } - if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { - params["address"] = storeDetail.Address - params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) - params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) - } - params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) - globals.SugarLogger.Debug(utils.Format4Output(params, false)) - if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite { - err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) + // params := map[string]interface{}{ + // "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), + // "phone": storeDetail.Tel1, + // "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), + // "shipping_time": openTimeJX2Mtwm(openTime), + // "third_tag_name": "蔬菜", + // } + // if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { + // params["address"] = storeDetail.Address + // params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) + // params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) + // } + // params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) + // globals.SugarLogger.Debug(utils.Format4Output(params, false)) + // if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite { + // err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) + // } + if err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)); err == nil { + openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) + if isOnline == mtwmapi.PoiStatusOffline { + err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) + } else { + err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID) + } + if err == nil { + if openLevel == mtwmapi.PoiOpenLevelHaveRest { + err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) + } else { + err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) + } + } } return err }