1

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)

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)