From ab445a8edfc3406f8fe9f0fc99e3fd18edb3ee63 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 25 Nov 2019 10:55:50 +0800 Subject: [PATCH] =?UTF-8?q?addOrderStatusk,=E7=BE=8E=E5=9B=A2=E5=9C=A8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E8=BF=98?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=94=B6=E5=88=B0=E8=AE=A2=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=EF=BC=88=E5=BA=94=E8=AF=A5=E5=BD=93=E6=88=90=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=8D=95=E5=A4=84=E7=90=86=E6=89=8D=E5=90=88=E9=80=82?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=BC=BA=E5=88=B6=E5=BF=BD=E7=95=A5=E8=BF=99?= =?UTF-8?q?=E7=A7=8D=E6=83=85=E5=86=B5=EF=BC=8C=E6=AF=94=E5=A6=82=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=9A80662201436073600?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 42d1f9332..908ebc15c 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -459,6 +459,10 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da VendorID: orderStatus.VendorID, } if err = db.Db.ReadForUpdate(order, "VendorOrderID", "VendorID"); err == nil { + // todo 美团在订单完成后，还可能收到订单取消（应该当成售后单处理才合适），强制忽略这种情况，比如订单：80662201436073600 + if orderStatus.VendorID == model.VendorIDMTWM && model.IsOrderFinalStatus(order.Status) { + return false, order, nil + } if (model.IsOrderLockStatus(orderStatus.Status) || model.IsOrderUnlockStatus(orderStatus.Status)) || (model.IsOrderMainStatus(orderStatus.Status) && orderStatus.Status >= order.Status) { // todo 要求status不能回绕 order.VendorStatus = orderStatus.VendorStatus