diff --git a/business/controller/elm/order.go b/business/controller/elm/order.go index ba081424c..96795d2a8 100644 --- a/business/controller/elm/order.go +++ b/business/controller/elm/order.go @@ -262,7 +262,7 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI // 饿了么没有拣货这个状态,直接返回成功 // 真实流程中也不会调用这个方法,因为接收订单后状态会直接转移到已拣货 -func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) { +func (c *OrderController) PickupGoods(order *model.GoodsOrder) (err error) { return nil } diff --git a/business/controller/jd/order.go b/business/controller/jd/order.go index 0c16503a8..96e1f36dc 100644 --- a/business/controller/jd/order.go +++ b/business/controller/jd/order.go @@ -187,7 +187,7 @@ func (c *OrderController) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI return err } -func (c *OrderController) PickedUpGoods(order *model.GoodsOrder) (err error) { +func (c *OrderController) PickupGoods(order *model.GoodsOrder) (err error) { _, err = api.JdAPI.OrderJDZBDelivery(order.VendorOrderID) return err } diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go index d417991e7..486815d7e 100644 --- a/business/scheduler/defsch/defsch.go +++ b/business/scheduler/defsch/defsch.go @@ -574,7 +574,7 @@ func (s *DefScheduler) updateOrderByBill(order *model.GoodsOrder, bill *model.Wa } func (s *DefScheduler) autoPickupGood(order *model.GoodsOrder) (err error) { - return s.PickedUpGoods(order) + return s.PickupGoods(order) } func (s *DefScheduler) isBillCandidate(order *model.GoodsOrder, bill *model.Waybill) bool { diff --git a/business/scheduler/scheduler.go b/business/scheduler/scheduler.go index 2a25e7c5c..180c59812 100644 --- a/business/scheduler/scheduler.go +++ b/business/scheduler/scheduler.go @@ -48,7 +48,7 @@ type PurchasePlatformHandler interface { GetStatusActionTimeout(statusType, status int) time.Duration AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool) (err error) - PickedUpGoods(order *model.GoodsOrder) (err error) + PickupGoods(order *model.GoodsOrder) (err error) Swtich2SelfDeliver(order *model.GoodsOrder) (err error) SelfDeliverDelievering(order *model.GoodsOrder) (err error) @@ -144,16 +144,16 @@ func (c *BaseScheduler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt } return err } -func (c *BaseScheduler) PickedUpGoods(order *model.GoodsOrder) (err error) { - globals.SugarLogger.Infof("PickedUpGoods orderID:%s", order.VendorOrderID) +func (c *BaseScheduler) PickupGoods(order *model.GoodsOrder) (err error) { + globals.SugarLogger.Infof("PickupGoods orderID:%s", order.VendorOrderID) if order.Status == model.OrderStatusAccepted { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogError(func() error { - return c.GetPurchasePlatformFromVendorID(order.VendorID).PickedUpGoods(order) - }, "PickedUpGoods orderID:%s", order.VendorOrderID) + return c.GetPurchasePlatformFromVendorID(order.VendorID).PickupGoods(order) + }, "PickupGoods orderID:%s", order.VendorOrderID) } } else { - globals.SugarLogger.Infof("PickedUpGoods orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status) + globals.SugarLogger.Infof("PickupGoods orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status) } return err }