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

1

Browse Source
This commit is contained in:
邹宗楠
2023-10-19 16:54:30 +08:00
parent 5071f5dcaf
commit 1c7ab3021d
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxstore/cms/cms.go
View File

@@ -628,7 +628,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
return nil, err return nil, err
} }
for _, v := range waybills { for _, v := range waybills {
globals.SugarLogger.Debugf("=============GetSToURidingDistance2 := %s", utils.Format4Output(v, false))
if v.Status == model.WaybillStatusCanceled { if v.Status == model.WaybillStatusCanceled {
continue continue
} }
@@ -637,10 +636,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
if v.OriginalData == "" { if v.OriginalData == "" {
//originalData, distance, durationTime, err := GetCyclingLine(origin, destination) //originalData, distance, durationTime, err := GetCyclingLine(origin, destination)
originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat) originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)
globals.SugarLogger.Debugf("===========originalData := %s", utils.Format4Output(originalData, false))
globals.SugarLogger.Debugf("===========originalData := %d", distance)
globals.SugarLogger.Debugf("===========originalData := %d", durationTime)
globals.SugarLogger.Debugf("===========originalData := %v", err)
if err == nil { if err == nil {
v.OriginalData = strings.Join(originalData, ";") v.OriginalData = strings.Join(originalData, ";")
v.Distance = distance v.Distance = distance
@@ -708,7 +703,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way
v.CourierCoordinate = riderLine[len(riderLine)-1] v.CourierCoordinate = riderLine[len(riderLine)-1]
} }
} }
globals.SugarLogger.Debugf("=======================2")
dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime")
if v.CourierName == "" || v.CourierMobile == "" { if v.CourierName == "" || v.CourierMobile == "" {
@@ -734,14 +728,10 @@ func GetCyclingLine(sLng, sLat, uLng, uLat float64) (polyLineList []string, dist
}) })
coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu) coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu)
globals.SugarLogger.Debugf("=========coords := %s", utils.Format4Output(coords, false))
globals.SugarLogger.Debugf("=========err := %v", err)
if err != nil || len(coords) <= model.NO { if err != nil || len(coords) <= model.NO {
return nil, 0, 0, err return nil, 0, 0, err
} }
data, err := api.BaiDuNaviAPI.DirectionLiteRide(coords) data, err := api.BaiDuNaviAPI.DirectionLiteRide(coords)
globals.SugarLogger.Debugf("=========data := %s", utils.Format4Output(data, false))
globals.SugarLogger.Debugf("=========err := %v", err)
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err
} }

3
business/partner/delivery/rider.go
View File

@@ -325,10 +325,7 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) {
} }
storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode) storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), storeId, order.VendorID, order.VendorOrgCode)
globals.SugarLogger.Debugf("========storeDetail := %s", utils.Format4Output(storeDetail, false))
waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID) waybill2, err := cms.GetSToURidingDistance2(jxutils.IntCoordinate2Standard(storeDetail.Lng), jxutils.IntCoordinate2Standard(storeDetail.Lat), jxutils.IntCoordinate2Standard(order.ConsigneeLng), jxutils.IntCoordinate2Standard(order.ConsigneeLat), fakeWayBill.VendorOrderID)
globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false))
globals.SugarLogger.Debugf("========err := %v", err)
if err != nil { if err != nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false))
} }