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

- renmae PickedUpGoods to PickupGoods.

Browse Source
This commit is contained in:
gazebo
2018-07-30 07:58:43 +08:00
parent 5c4d34554f
commit 7fae4dd52a
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/controller/elm/order.go
View File

@@ -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
}

2
business/controller/jd/order.go
View File

@@ -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
}

2
business/scheduler/defsch/defsch.go
View File

@@ -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 {

12
business/scheduler/scheduler.go
View File

@@ -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
}