From c1f245472279e15413d6610138985fd6dc9d49b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 12 Sep 2023 18:39:43 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/cms.go | 3 +++ business/partner/purchase/tao_vegetable/order.go | 2 +- globals/api/apimanager/apimanager.go | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 1aac9fea8..303e76ad7 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -733,6 +733,9 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist if err != nil { return nil, 0, 0, err } + if data == "" { + return nil, 0, 0, fmt.Errorf("获取骑行规划路线错误") + } path := &baidunavi.RiderPath{} if err := json.Unmarshal([]byte(data.(string)), path); err != nil { return nil, 0, 0, err diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 9e8994444..05f579597 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -249,7 +249,7 @@ func PushDelivererChangeInfo(order *model.GoodsOrder, bill *model.Waybill, deliv LogisticsNo: utils.String2Pointer(bill.VendorWaybillID), }, } - return getAPI(order.VendorOrgCode, 0, "").DelivererChange(param) + return getAPI(order.VendorOrgCode, order.JxStoreID, order.VendorStoreID).DelivererChange(param) } func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) { diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index d98472b25..9826f2a0b 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -69,9 +69,6 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) } case model.VendorIDTaoVegetable: api := api.TaoVegetableApi - //if beego.BConfig.RunMode == "dev" { - // api.SetToken("50002C00414zMSClqLiSDjBr2N19748391yiazjtFmsgTOdbBftik0XDfkUQywSmcjfC") - //} else if api == nil || api.GetToken() == "" { codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform") if len(codes) == 0 { return nil @@ -89,8 +86,6 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "淘鲜达token过期", ",请重新授权") } } - //} - pfAPI = api case model.VendorIDEBAI: pfAPI = api.EbaiAPI