From b4ddfa37dfb19c0c6b6e42be278abcda7623452c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 11 Jan 2024 16:05:39 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/cms.go | 5 ++++- business/partner/delivery/rider.go | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index 2ea98fae4..45d0acf34 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -686,7 +686,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way courierDistance = float64(v.Distance) } nowCourierDrop := int64(math.Ceil((courierDistance / float64(v.Distance)) * float64(len(riderLine)))) // 当前骑手骑行距离,占中的骑行距离百分比. - v.CourierCoordinate = riderLine[nowCourierDrop] if nowCourierDrop >= int64(len(riderLine)) { v.CourierCoordinate = riderLine[nowCourierDrop-1] } @@ -696,6 +695,10 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way if v.Status >= model.WaybillStatusDelivered { v.CourierCoordinate = riderLine[len(riderLine)-1] } + if v.CourierCoordinate == "" { + v.CourierCoordinate = riderLine[nowCourierDrop] + } + } dao.UpdateEntity(db, v, "OriginalData", "CourierCoordinate", "Distance", "DurationTime") diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 3fc4b2999..41c3a22d0 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -451,7 +451,6 @@ func UpdateFakeWayBillToTiktok() { // continue //} - globals.SugarLogger.Debugf("==========fakeWayBill %s", utils.Format4Output(fakeWayBill[i], false)) riderInfo := &utils.RiderInfo{ OrderId: fakeWayBill[i].VendorOrderID, ThirdCarrierOrderId: fakeWayBill[i].VendorWaybillID, @@ -486,7 +485,6 @@ func UpdateFakeWayBillToTiktok() { paramsMap := utils.Struct2Map(riderInfo, "", true) handler := partner.GetPurchaseOrderHandlerFromVendorID(fakeWayBill[i].OrderVendorID) order, _ := partner.CurOrderManager.LoadOrder(fakeWayBill[i].VendorOrderID, fakeWayBill[i].OrderVendorID) - globals.SugarLogger.Debugf("==========paramsMap %s", utils.Format4Output(paramsMap, false)) if handler != nil { if err := handler.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, paramsMap); err != nil { partner.CurOrderManager.OnOrderMsg(order, tao_vegetable.OrderStatusDelivery, fmt.Sprintf("Fake Pull Rider Info Err :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err))