From f86030753054d7203ef6fde5ecec7ad4e7dca693 Mon Sep 17 00:00:00 2001 From: gazebo Date: Tue, 23 Apr 2019 15:49:39 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=A6=82=E6=9E=9C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=98=AF=E8=A7=A3=E9=94=81=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8OnOrderStatusChanged?= =?UTF-8?q?=E4=B8=AD=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 4adb3d0b4..5db3e672e 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -254,7 +254,8 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod // }) // } // } - if order.LockStatus == model.OrderStatusUnknown && (status.Status > model.OrderStatusUnknown || status.Status == model.OrderStatusRefuseFailedGetGoods) { // 只处理状态转换，一般消息不处理 + if (model.IsOrderUnlockStatus(status.Status)) || + (order.LockStatus == model.OrderStatusUnknown && (status.Status > model.OrderStatusUnknown || status.Status == model.OrderStatusRefuseFailedGetGoods)) { // 只处理状态转换，一般消息不处理 if status.Status == model.OrderStatusRefuseFailedGetGoods && order.Status != model.OrderStatusFinishedPickup && !model.IsOrderFinalStatus(order.Status) { order.Status = model.OrderStatusFinishedPickup partner.CurOrderManager.UpdateOrderStatusAndFlag(order)