1
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user