From cbbf2399213f1315b1bfb8c2b1fa7f91dda9e1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 9 Aug 2024 14:13:20 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/basesch/basesch.go | 3 +++ business/jxstore/cms/cms.go | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index cf86b9617..764e176d6 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -132,6 +132,9 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName } else if strings.Contains(err.Error(), "商家没有接入众包配送,无法进行众包配送相关操作") { partner.CurOrderManager.OnOrderMsg(order, "商家无配送设置,转配送成功", err.Error()) err = nil + } else if strings.Contains(err.Error(), "无需重复取消") { + partner.CurOrderManager.OnOrderMsg(order, "商家无配送设置,转配送成功", err.Error()) + err = nil } else { bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) err = c.CancelWaybill(bill, partner.CancelWaybillReasonOther, userName+":5"+partner.CancelWaybillReasonStrActive) diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go index d36024407..361881186 100644 --- a/business/jxstore/cms/cms.go +++ b/business/jxstore/cms/cms.go @@ -623,9 +623,6 @@ func GetSToURidingDistance2(sLng, sLat, uLng, uLat float64, orderId string) (way return nil, err } for _, v := range waybills { - if v.Status == model.WaybillStatusCanceled { - continue - } // 获取骑行路线图 if v.OriginalData == "" { originalData, distance, durationTime, err := GetCyclingLine(sLng, sLat, uLng, uLat)