From 538c2dddd1a5be1670f810449666cb0df725ff07 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 24 Aug 2018 15:51:17 +0800 Subject: [PATCH] - fk. --- business/jxcallback/orderman/orderman_ext.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 43cf1977c..d5d95b093 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -126,6 +126,7 @@ 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(` SELECT t1.*, t2.status waybill_status, t2.courier_name, t2.courier_mobile FROM goods_order t1 @@ -142,7 +143,7 @@ func (c *OrderManager) GetOrderInfo(vendorOrderID string, vendorID int) (order * return nil, err } -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) db := orm.NewOrm() num, err := db.Raw(` @@ -150,7 +151,7 @@ func (c *OrderManager) GetOrderWaybillInfo(vendorOrderID string, vendorID int) ( FROM waybill t1 WHERE t1.vendor_order_id = ? AND order_vendor_id = ? `, vendorOrderID, vendorID).QueryRows(&bills) - if err == nil && num > 0 { + if err == nil { return bills, nil } if num == 0 {