- handle ErrNoRows in LoadOrder.
This commit is contained in:
@@ -334,6 +334,9 @@ func (c *OrderManager) LoadOrder(vendorOrderID string, vendorID int) (order *mod
|
|||||||
}, "LoadOrder orderID:%s", vendorOrderID)
|
}, "LoadOrder orderID:%s", vendorOrderID)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if err == orm.ErrNoRows {
|
||||||
|
err = ErrCanNotFindOrder
|
||||||
|
}
|
||||||
globals.SugarLogger.Infof("LoadOrder orderID:%s failed with error:%v", vendorOrderID, err)
|
globals.SugarLogger.Infof("LoadOrder orderID:%s failed with error:%v", vendorOrderID, err)
|
||||||
}
|
}
|
||||||
return order, err
|
return order, err
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package orderman
|
package orderman
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"sort"
|
"sort"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -20,6 +21,10 @@ const (
|
|||||||
maxSleepGapHandlePendingOrder = 5 * time.Millisecond // 每个pending order的最长时间间隙
|
maxSleepGapHandlePendingOrder = 5 * time.Millisecond // 每个pending order的最长时间间隙
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrCanNotFindOrder = errors.New("找不到相应订单")
|
||||||
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
FixedOrderManager *OrderManager
|
FixedOrderManager *OrderManager
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package orderman
|
package orderman
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
@@ -16,10 +15,6 @@ const (
|
|||||||
defPageSize = 50
|
defPageSize = 50
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
|
||||||
ErrCanNotFindOrder = errors.New("找不到相应订单")
|
|
||||||
)
|
|
||||||
|
|
||||||
func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStatus, toStatus, offset, pageSize int) (orders []*model.GoodsOrderExt, err error) {
|
func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStatus, toStatus, offset, pageSize int) (orders []*model.GoodsOrderExt, err error) {
|
||||||
if lastHours > maxLastHours {
|
if lastHours > maxLastHours {
|
||||||
lastHours = maxLastHours
|
lastHours = maxLastHours
|
||||||
|
|||||||
Reference in New Issue
Block a user