diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 02ac12850..666bb7255 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -16,6 +16,7 @@ const ( ) func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStatus, toStatus, offset, pageSize int) (orders []*model.GoodsOrderExt, err error) { + globals.SugarLogger.Debugf("GetStoreOrderInfo storeID:%s", storeID) if lastHours > maxLastHours { lastHours = maxLastHours } else if lastHours == 0 { @@ -50,6 +51,7 @@ func (c *OrderManager) GetStoreOrderInfo(storeID string, lastHours int, fromStat } func (c *OrderManager) GetStoreOrderCountInfo(storeID string, lastHours int) (countInfo []*model.GoodsOrderCountInfo, err error) { + globals.SugarLogger.Debugf("GetStoreOrderCountInfo storeID:%s", storeID) if lastHours > maxLastHours { lastHours = maxLastHours } else if lastHours == 0 { @@ -73,6 +75,7 @@ func (c *OrderManager) GetStoreOrderCountInfo(storeID string, lastHours int) (co } func (c *OrderManager) GetOrderSkuInfo(vendorOrderID string, vendorID int) (skus []*model.OrderSkuExt, err error) { + globals.SugarLogger.Debugf("GetOrderSkuInfo orderID:%s", vendorOrderID) db := orm.NewOrm() num, err := db.Raw(` SELECT t1.*, t3.img image diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 9d3c17f44..5a1d90bca 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -10,21 +10,25 @@ import ( "github.com/astaxie/beego/orm" ) -func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID int) (bills []*model.Waybill, err error) { +func (c *BaseScheduler) CreateWaybillOnProviders(vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) { + globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { bill, err2 := c.CreateWaybill(model.VendorIDMTPS, order, nil) if err = err2; err == nil { + globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s bill:%s", vendorOrderID, userName, bill.WaybillVendorID) return []*model.Waybill{ bill, }, nil } } + globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s error:%v", vendorOrderID, userName, err) return nil, err } // todo 这里应该要考虑纯自送与转自送 func (c *BaseScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { + globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { if getStoreDeliveryType(order) == scheduler.StoreDeliveryTypeByStore { @@ -34,14 +38,19 @@ func (c *BaseScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vend } if err == nil { order.Status = model.OrderStatusDelivering - err = partner.CurOrderManager.UpdateOrderStatusDirectly(order) + if err = partner.CurOrderManager.UpdateOrderStatusDirectly(order); err == nil { + globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName) + return err + } } } + globals.SugarLogger.Infof("SelfDeliveringAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err) return err } // todo 这里应该要考虑纯自送与转自送 func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { + globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { if getStoreDeliveryType(order) == scheduler.StoreDeliveryTypeByStore { @@ -51,21 +60,30 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(vendorOrderID string, vendo } if err == nil { order.Status = model.OrderStatusDelivered - err = partner.CurOrderManager.UpdateOrderStatusDirectly(order) + if err = partner.CurOrderManager.UpdateOrderStatusDirectly(order); err == nil { + globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName) + return err + } } } + globals.SugarLogger.Infof("SelfDeliveredAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err) return err } func (c *BaseScheduler) PickupGoodsAndUpdateStatus(vendorOrderID string, vendorID int, userName string) (err error) { + globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s", vendorOrderID, userName) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { err = c.PickupGoods(order, userName) if err == nil { order.Status = model.OrderStatusFinishedPickup - err = partner.CurOrderManager.UpdateOrderStatusDirectly(order) + if err = partner.CurOrderManager.UpdateOrderStatusDirectly(order); err == nil { + globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s successfully", vendorOrderID, userName) + return err + } } } + globals.SugarLogger.Infof("PickupGoodsAndUpdateStatus orderID:%s userName:%s error:%v", vendorOrderID, userName, err) return err } diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 46250492a..e830fbddb 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -120,7 +120,7 @@ func (c *OrderController) SelfDelivered() { // @router /CreateWaybillOnProviders [post] func (c *OrderController) CreateWaybillOnProviders() { c.orderOperate(func(vendorOrderID string, vendorID int, userName string) (interface{}, error) { - return basesch.FixedBaseScheduler.CreateWaybillOnProviders(vendorOrderID, vendorID) + return basesch.FixedBaseScheduler.CreateWaybillOnProviders(vendorOrderID, vendorID, userName) }) }