From 2c457a38d5387ff5b56cb250866847ecfe53a9d2 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 3 Apr 2019 20:42:02 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E5=A4=96=E5=8D=96=E9=97=A8=E5=BA=97=E8=A6=81=E6=8A=A5=E9=94=99?= =?UTF-8?q?"=E5=95=86=E5=AE=B6=E5=B7=B2=E6=8E=A5=E5=85=A5=E7=BE=8E?= =?UTF-8?q?=E5=9B=A2=E9=85=8D=E9=80=81=EF=BC=8C=E4=B8=8D=E5=8F=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=A8=E5=BA=97=E9=85=8D=E9=80=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"=EF=BC=8C=E8=BF=98=E6=98=AF=E5=8F=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81=E4=B8=8E?= =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/mtwm/store.go | 93 +++++++++++++------------ 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 675d2b242..987931332 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -103,57 +103,58 @@ 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 - } 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 true { //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.EnableMtwmStoreWrite { - err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) - } - // openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) - // if globals.EnableMtwmStoreWrite { - // if isOnline != mtwmapi.PoiStatusOnline { - // err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) - // } else { - // if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil { - // // 这个函数成功返回也并不表示上线成功。。。 - // remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) - // if err = err2; err != nil { - // return err - // } - // if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline { - // if openLevel == mtwmapi.PoiOpenLevelHaveRest { - // err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) - // } else { - // err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) - // } - // if err == nil { - // err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)) - // } - // } else { - // err = errors.New("门店还未上线，不能修改营业状态") - // } - // } - // } + openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) + // remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + // if err != nil { + // return err // } + // 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 true { //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"] = openLevel + // params["is_online"] = isOnline + // globals.SugarLogger.Debug(utils.Format4Output(params, false)) + // if globals.EnableMtwmStoreWrite { + // err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) + // } + if globals.EnableMtwmStoreWrite { + if isOnline != mtwmapi.PoiStatusOnline { + err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID) + } else { + if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil { + // 这个函数成功返回也并不表示上线成功。。。 + remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + if err = err2; err != nil { + return err + } + if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline { + if openLevel == mtwmapi.PoiOpenLevelHaveRest { + err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID) + } else { + err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID) + } + if err == nil { + err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)) + } + } else { + err = errors.New("门店还未上线，不能修改营业状态") + } + } + } + } return err }