From 4dcd8b0fb81d1114656e448f6898df6a9065cc60 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 24 Aug 2018 16:04:06 +0800 Subject: [PATCH] - fk2. --- business/jxcallback/orderman/orderman_ext.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index d5d95b093..7ad211c4c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -126,17 +126,19 @@ func (c *OrderManager) GetOrderSkuInfo(vendorOrderID string, vendorID int) (skus func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int) (order *model.GoodsOrderExt, err error) { globals.SugarLogger.Debugf("GetOrderInfo orderID:%s", vendorOrderID) db := orm.NewOrm() - order = &model.GoodsOrderExt{} - err = db.Raw(` + orders := []*model.GoodsOrderExt{} + num, err := db.Raw(` SELECT t1.*, t2.status waybill_status, t2.courier_name, t2.courier_mobile 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) - if err == nil { + `, vendorOrderID, vendorID).QueryRows(&orders) + if err == nil && num == 1 { + order = orders[0] + globals.SugarLogger.Debug(order) return order, nil } - if err == orm.ErrNoRows { + if err == orm.ErrNoRows || num == 0 { err = ErrCanNotFindOrder } globals.SugarLogger.Infof("GetOrderInfo orderID:%s failed with error:%v", vendorOrderID, err)