diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 643da18cc..c28c5e7d1 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -703,6 +703,8 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string, vend v.CourierCoordinate = riderLine[nowCourierDrop] } + } else if (v.WaybillVendorID == model.VendorJXFakeWL || v.WaybillVendorID == model.VendorIDUnknown || v.CourierCoordinate == "") && v.OriginalData == "" { + v.CourierCoordinate = "" } dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index a738b7c84..65397d35c 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -384,10 +384,10 @@ func makeRiderInfo(fakeWayBill *model.Waybill, riderInfo *utils.RiderInfo) error } courierCoordinate := strings.Split(waybill2.CourierCoordinate, ",") - if len(courierCoordinate) < 2 && fakeWayBill.Status < model.WaybillStatusDelivered { + if waybill2.CourierCoordinate == "" && fakeWayBill.Status < model.WaybillStatusDelivered { courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(storeDetail.Lat))) } - if len(courierCoordinate) < 2 && fakeWayBill.Status >= model.WaybillStatusDelivered { + if waybill2.CourierCoordinate == "" && fakeWayBill.Status >= model.WaybillStatusDelivered { courierCoordinate = append(courierCoordinate, utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLng)), utils.Float64ToStr(jxutils.IntCoordinate2Standard(order.ConsigneeLat))) } switch fakeWayBill.Status { diff --git a/business/partner/delivery/rider_test.go b/business/partner/delivery/rider_test.go index 5464e192c..5501f378b 100644 --- a/business/partner/delivery/rider_test.go +++ b/business/partner/delivery/rider_test.go @@ -1,19 +1,9 @@ package delivery import ( - "fmt" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils" "testing" ) func TestRider(t *testing.T) { GetOrderRiderInfoToPlatform("144228632526740576", 0) } - -func TestCcc(t *testing.T) { - aa := utils.Float64ToStr(jxutils.IntCoordinate2Standard(103989607)) - bb := utils.Float64ToStr(jxutils.IntCoordinate2Standard(30560797)) - fmt.Println(aa) - fmt.Println(bb) -}