liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-03-30 11:21:22 +08:00
parent 2d4af5f61d 31d540d33a
commit c205cebcd1
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/partner/delivery/uupt/waybill.go
View File

@@ -256,6 +256,15 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
Lng: jxutils.IntCoordinate2Standard(order.ConsigneeLng), Lng: jxutils.IntCoordinate2Standard(order.ConsigneeLng),
}) })
coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu) coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu)
weight := 4
tempWeight := 0
if order.Weight/1000 >= weight {
tempWeight = weight
} else if order.Weight/1000 < 1 {
tempWeight = 1
} else {
tempWeight = int(order.Weight / 1000)
}
param := map[string]interface{}{ param := map[string]interface{}{
"origin_id": order.VendorOrderID, "origin_id": order.VendorOrderID,
"from_address": store.Address, "from_address": store.Address,
@@ -267,7 +276,9 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
"from_lng": coords[0].Lng, "from_lng": coords[0].Lng,
"to_lat": coords[1].Lat, "to_lat": coords[1].Lat,
"to_lng": coords[1].Lng, "to_lng": coords[1].Lng,
"goods_weight": tempWeight,
} }
if orderPrice, err = api.UuAPI.GetOrderPrice(param); err != nil { if orderPrice, err = api.UuAPI.GetOrderPrice(param); err != nil {
return nil, err return nil, err
} else { } else {