From f438b005a21d057abaea5116881ffb1803ab1d64 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 18 Sep 2019 14:16:30 +0800
Subject: [PATCH] - fk

---
 business/jxcallback/orderman/order.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 511d6001e..ed5370137 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -161,8 +161,10 @@ func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err
 	if err == nil {
 		dao.Commit(db)
 		if !isDuplicated {
-			// order.Skus = c.loadOrderSku(db, order.VendorOrderID, order.VendorID)
-			_ = scheduler.CurrentScheduler.OnOrderStatusChanged(order, orderStatus, false)
+			if order != nil {
+				order.Skus = c.loadOrderSku(db, order.VendorOrderID, order.VendorID)
+				_ = scheduler.CurrentScheduler.OnOrderStatusChanged(order, orderStatus, false)
+			}
 		}
 	} else {
 		dao.Rollback(db)
@@ -471,6 +473,7 @@ func (c *OrderManager) addOrderStatus(orderStatus *model.OrderStatus, db *dao.Da
 				isDuplicated = true
 			}
 		} else {
+			order = nil
 			if dao.IsNoRowsError(err) { // todo 消息错序
 				err = nil
 			} else {