- loadXXX中如果出错，返回的order强制设置为nil

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
 		}

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)