1

business/jxcallback/scheduler/basesch/basesch.go

@@ -135,14 +135,15 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
 					orderStatus, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).OrderLogisticsStatus(utils.Str2Int64(order.VendorOrderID))
 					if orderStatus == 100 { // 美团取消配送单
 						partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送成功.", "")
-						err = nil
+						return nil
 					} else if strings.Contains(err.Error(), "包裹不存在") || strings.Contains(err.Error(), "运单不存在") || strings.Contains(err.Error(), "1071") || strings.Contains(err.Error(), "1014") || strings.Contains(err.Error(), "invalid character 'o' looking for beginning of value") {
 						partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送可能成功,异常:", err.Error())
-						err = nil
+						return nil
 					} else {
 						bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID)
-						c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
+						err = c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive)
 						partner.CurOrderManager.OnOrderMsg(order, "美团外卖运单无法取消,", err.Error())
+						return err
 					}
 				}