From 669d9096195bca331d3b6ea7e2a6dc13e93aa07d Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 14 May 2019 14:01:21 +0800
Subject: [PATCH] =?UTF-8?q?-=20loadXXX=E4=B8=AD=E5=A6=82=E6=9E=9C=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=9A=84order=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E8=AE=BE=E7=BD=AE=E4=B8=BAnil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go     | 2 ++
 business/jxcallback/orderman/order_afs.go | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 8b7a459a6..198b7f883 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -425,6 +425,7 @@ func (c *OrderManager) loadOrder(vendorOrderID, vendorOrderID2 string, vendorID
 		}, "LoadOrder orderID:%s", vendorOrderID)
 	}
 	if err != nil {
+		order = nil
 		if err == orm.ErrNoRows {
 			err = ErrCanNotFindOrder
 		}
@@ -475,6 +476,7 @@ func (c *OrderManager) loadOrderFinancial(vendorOrderID, vendorOrderID2 string,
 		}, "LoadOrder orderID:%s", vendorOrderID)
 	}
 	if err != nil {
+		order = nil
 		if err == orm.ErrNoRows {
 			err = ErrCanNotFindOrder
 		}
diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go
index f6014a086..32abcbc48 100644
--- a/business/jxcallback/orderman/order_afs.go
+++ b/business/jxcallback/orderman/order_afs.go
@@ -20,7 +20,9 @@ func (c *OrderManager) loadAfsOrder(db *dao.DaoDB, vendorAfsOrderID string, vend
 		AfsOrderID: vendorAfsOrderID,
 		VendorID:   vendorID,
 	}
-	err = dao.GetEntity(db, afsOrder, "AfsOrderID", "VendorID")
+	if err = dao.GetEntity(db, afsOrder, "AfsOrderID", "VendorID"); err != nil {
+		afsOrder = nil
+	}
 	return afsOrder, err
 }
 
@@ -42,7 +44,7 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
 		}
 	}()
 	isDuplicated, err := addOrderOrWaybillStatus(orderStatus, db)
-	globals.SugarLogger.Debugf("onAfsOrderNew isDuplicated:%t", isDuplicated)
+	globals.SugarLogger.Debugf("onAfsOrderNew afsOrderID:%s, isDuplicated:%t", afsOrder.AfsOrderID, isDuplicated)
 	if err != nil || isDuplicated {
 		if err == nil {
 			dao.Commit(db)