From 66a413b11e23ef304dc9038319bdc45317bd6ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 30 Aug 2022 09:54:15 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/basesch/basesch.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 18c70c962..1ca46a216 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -133,12 +133,12 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName } // 查询订单状态, orderStatus, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).OrderLogisticsStatus(utils.Str2Int64(order.VendorOrderID)) - if orderStatus != 100 || !strings.Contains(err.Error(), "包裹不存在") { // 美团取消配送单 + if orderStatus == 100 || strings.Contains(err.Error(), "包裹不存在") || strings.Contains(err.Error(), "1071") || strings.Contains(err.Error(), "1014") { // 美团取消配送单 + partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送成功.", "") + } else { bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) c.CancelWaybill(bill, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) partner.CurOrderManager.OnOrderMsg(order, "美团外卖运单无法取消,", err.Error()) - } else { - partner.CurOrderManager.OnOrderMsg(order, "美团外卖转自送成功.", "") } }