liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix bug.

Browse Source
This commit is contained in:
gazebo
2018-08-24 15:32:10 +08:00
parent 2f19dcf546
commit e2c5e467fc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxcallback/orderman/orderman_ext.go
View File

@@ -131,10 +131,13 @@ func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int) (order *
FROM goods_order t1 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 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 = ? WHERE t1.vendor_order_id = ? AND vendor_id = ?
`, vendorOrderID, vendorID).QueryRow(&order) `, vendorOrderID, vendorID).QueryRow(order)
if err == nil { if err == nil {
return order, nil return order, nil
} }
if err == orm.ErrNoRows {
err = ErrCanNotFindOrder
}
globals.SugarLogger.Infof("GetOrderInfo orderID:%s failed with error:%v", vendorOrderID, err) globals.SugarLogger.Infof("GetOrderInfo orderID:%s failed with error:%v", vendorOrderID, err)
return nil, 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) { func (c *OrderManager) GetOrderWaybillInfo(vendorOrderID string, vendorID int) (bills *[]model.Waybill, err error) {
globals.SugarLogger.Debugf("GetOrderWaybillInfo orderID:%s", vendorOrderID) globals.SugarLogger.Debugf("GetOrderWaybillInfo orderID:%s", vendorOrderID)
db := orm.NewOrm() db := orm.NewOrm()
_, err = db.Raw(` num, err := db.Raw(`
SELECT t1.* SELECT t1.*
FROM waybill t1 FROM waybill t1
WHERE t1.vendor_order_id = ? AND order_vendor_id = ? WHERE t1.vendor_order_id = ? AND order_vendor_id = ?
`, vendorOrderID, vendorID).QueryRows(&bills) `, vendorOrderID, vendorID).QueryRows(&bills)
if err == nil { if err == nil && num > 0 {
return bills, nil return bills, nil
} }
if num == 0 {
err = ErrCanNotFindOrder
}
globals.SugarLogger.Infof("GetOrderWaybillInfo orderID:%s failed with error:%v", vendorOrderID, err) globals.SugarLogger.Infof("GetOrderWaybillInfo orderID:%s failed with error:%v", vendorOrderID, err)
return nil, err return nil, err
} }