From 63ee62eecce5b0df4705034acb3f304b5aa964b0 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 25 Nov 2019 16:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E6=9D=A5=E5=8F=88=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E6=9C=89=E8=AE=A2=E5=8D=95=EF=BC=8881710104014426376=EF=BC=89?= =?UTF-8?q?=E5=9C=A8=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=86=8D=E8=A2=AB=E5=8F=96=E6=B6=88=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E7=94=9F=E6=88=90=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=BF=98=E6=98=AF=E5=86=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=8F=96=E6=B6=88=E3=80=82=E3=80=82?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 908ebc15c..baad32e92 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -460,9 +460,10 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da } 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 - } + // 后来又发现有订单（81710104014426376）在完成后，直接再被取消的情况，不能生成售后单，还是再允许完成后取消。。。 + // 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