From 471007a7e930dcb92b5f3b24baf20ef7e383db00 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 23 Aug 2018 14:31:57 +0800
Subject: [PATCH] - handle ErrNoRows in LoadOrder.

---
 business/jxcallback/orderman/order.go        | 3 +++
 business/jxcallback/orderman/orderman.go     | 5 +++++
 business/jxcallback/orderman/orderman_ext.go | 5 -----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 0f5e51f1a..be98d21cc 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -334,6 +334,9 @@ func (c *OrderManager) LoadOrder(vendorOrderID string, vendorID int) (order *mod
 		}, "LoadOrder orderID:%s", vendorOrderID)
 	}
 	if err != nil {
+		if err == orm.ErrNoRows {
+			err = ErrCanNotFindOrder
+		}
 		globals.SugarLogger.Infof("LoadOrder orderID:%s failed with error:%v", vendorOrderID, err)
 	}
 	return order, err
diff --git a/business/jxcallback/orderman/orderman.go b/business/jxcallback/orderman/orderman.go
index e07ed3879..8c9e2176b 100644
--- a/business/jxcallback/orderman/orderman.go
+++ b/business/jxcallback/orderman/orderman.go
@@ -1,6 +1,7 @@
 package orderman
 
 import (
+	"errors"
 	"sort"
 	"time"
 
@@ -20,6 +21,10 @@ const (
 	maxSleepGapHandlePendingOrder = 5 * time.Millisecond // 每个pending order的最长时间间隙
 )
 
+var (
+	ErrCanNotFindOrder = errors.New("找不到相应订单")
+)
+
 var (
 	FixedOrderManager *OrderManager
 )
diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 8c35ffced..02ac12850 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1,7 +1,6 @@
 package orderman
 
 import (
-	"errors"
 	"time"
 
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -16,10 +15,6 @@ const (
 	defPageSize  = 50
 )
 
-var (
-	ErrCanNotFindOrder = errors.New("找不到相应订单")
-)
-
 func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStatus, toStatus, offset, pageSize int) (orders []*model.GoodsOrderExt, err error) {
 	if lastHours > maxLastHours {
 		lastHours = maxLastHours