From e2c5e467fc09755319b3ac72ea69268eb25bc248 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 24 Aug 2018 15:32:10 +0800 Subject: [PATCH] - fix bug. --- business/jxcallback/orderman/orderman_ext.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 443bdd473..43cf1977c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -131,10 +131,13 @@ func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int) (order * FROM goods_order t1 LEFT JOIN waybill t2 ON t1.vendor_waybill_id = t2.vendor_waybill_id AND t1.waybill_vendor_id = t2.waybill_vendor_id WHERE t1.vendor_order_id = ? AND vendor_id = ? - `, vendorOrderID, vendorID).QueryRow(&order) + `, vendorOrderID, vendorID).QueryRow(order) if err == nil { return order, nil } + if err == orm.ErrNoRows { + err = ErrCanNotFindOrder + } globals.SugarLogger.Infof("GetOrderInfo orderID:%s failed with error:%v", vendorOrderID, err) return nil, err } @@ -142,14 +145,17 @@ func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int) (order * func (c *OrderManager) GetOrderWaybillInfo(vendorOrderID string, vendorID int) (bills *[]model.Waybill, err error) { globals.SugarLogger.Debugf("GetOrderWaybillInfo orderID:%s", vendorOrderID) db := orm.NewOrm() - _, err = db.Raw(` + num, err := db.Raw(` SELECT t1.* FROM waybill t1 WHERE t1.vendor_order_id = ? AND order_vendor_id = ? `, vendorOrderID, vendorID).QueryRows(&bills) - if err == nil { + if err == nil && num > 0 { return bills, nil } + if num == 0 { + err = ErrCanNotFindOrder + } globals.SugarLogger.Infof("GetOrderWaybillInfo orderID:%s failed with error:%v", vendorOrderID, err) return nil, err }