diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 631c3480c..71d4acbc4 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -5,6 +5,7 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/autonavi" "git.rosy.net.cn/baseapi/platformapi/baidunavi" + "git.rosy.net.cn/jx-callback/globals" "math" "reflect" "regexp" @@ -635,6 +636,10 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way if v.OriginalData == "" { //originalData, distance, durationTime, err := GetCyclingLine(origin, destination) 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 { v.OriginalData = strings.Join(originalData, ";") v.Distance = distance @@ -681,6 +686,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way } } } + globals.SugarLogger.Debugf("=======================1") // 当这个运单为假物流/门店真实自送/获取运单骑手信息为空的时候使用假的骑手信息 if (v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "") && v.OriginalData != "" { @@ -701,6 +707,7 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way v.CourierCoordinate = riderLine[len(riderLine)-1] } } + globals.SugarLogger.Debugf("=======================2") dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") if v.CourierName == "" || v.CourierMobile == "" { diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index fe72aa7dc..8ee9ec77d 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -327,11 +327,12 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) { 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) + globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false)) + globals.SugarLogger.Debugf("========err := %v", err) if err != nil { ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "百度地图骑行方案获取错误:", utils.Format4Output(err.Error(), false)) } - globals.SugarLogger.Debugf("========waybill2 := %s", utils.Format4Output(waybill2, false)) - globals.SugarLogger.Debugf("========err := %v", err) + courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",") if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered { courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat)))