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

- fix SelfDeliverDelievering to SelfDeliverDelivering.

Browse Source
This commit is contained in:
gazebo
2018-10-09 17:42:14 +08:00
parent a288ce2213
commit a8c35c2448
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxcallback/scheduler/basesch/basesch.go
View File

@@ -135,13 +135,13 @@ func (c *BaseScheduler) Swtich2SelfDelivered(order *model.GoodsOrder, userName s
return err return err
} }
func (c *BaseScheduler) SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error) { func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievering orderID:%s", order.VendorOrderID) globals.SugarLogger.Infof("SelfDeliverDelivering orderID:%s", order.VendorOrderID)
if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup { if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup {
if c.IsReallyCallPlatformAPI { if c.IsReallyCallPlatformAPI {
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievering(order, userName) return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName)
}, "SelfDeliverDelievering orderID:%s", order.VendorOrderID) }, "SelfDeliverDelivering orderID:%s", order.VendorOrderID)
if err == nil { // 因为有些平台设置配送中后，不会发送订单在配送中消息过来，所以成功后就强制设置状态为配送中 if err == nil { // 因为有些平台设置配送中后，不会发送订单在配送中消息过来，所以成功后就强制设置状态为配送中
order.Status = model.OrderStatusDelivering order.Status = model.OrderStatusDelivering
} }
@@ -149,10 +149,10 @@ func (c *BaseScheduler) SelfDeliverDelievering(order *model.GoodsOrder, userName
} else { } else {
if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusFinishedPickup { if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusFinishedPickup {
err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
globals.SugarLogger.Infof("SelfDeliverDelievering orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status) globals.SugarLogger.Infof("SelfDeliverDelivering orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status)
} else { } else {
err = scheduler.ErrOrderStatusAlreadySatisfyCurOperation err = scheduler.ErrOrderStatusAlreadySatisfyCurOperation
globals.SugarLogger.Debugf("SelfDeliverDelievering orderID:%s, status:%d already ok", order.VendorOrderID, order.Status) globals.SugarLogger.Debugf("SelfDeliverDelivering orderID:%s, status:%d already ok", order.VendorOrderID, order.Status)
} }
} }
return err return err

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

@@ -316,7 +316,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.cancelOtherWaybills(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) s.cancelOtherWaybills(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
if bill.WaybillVendorID != bill.OrderVendorID { if bill.WaybillVendorID != bill.OrderVendorID {
if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
s.SelfDeliverDelievering(savedOrderInfo.order, "") s.SelfDeliverDelivering(savedOrderInfo.order, "")
} else { } else {
s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second) s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second)
} }

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

@@ -21,7 +21,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendo
if err == nil { if err == nil {
if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
if order.Status <= model.OrderStatusFinishedPickup { if order.Status <= model.OrderStatusFinishedPickup {
err = s.SelfDeliverDelievering(order, "") err = s.SelfDeliverDelivering(order, "")
} }
} else { } else {
if order.Status <= model.OrderStatusFinishedPickup { if order.Status <= model.OrderStatusFinishedPickup {

2
business/partner/partner.go
View File

@@ -62,7 +62,7 @@ type IPurchasePlatformHandler interface {
Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error)
// 完全自送的门店表示开始配送 // 完全自送的门店表示开始配送
SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error)
// 完全自送的门店表示配送完成 // 完全自送的门店表示配送完成
SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error)

2
business/partner/purchase/ebai/order.go
View File

@@ -132,7 +132,7 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
} }
// 完全自送的门店表示开始配送 // 完全自送的门店表示开始配送
func (p *PurchaseHandler) SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName) err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
return err return err
} }

2
business/partner/purchase/elm/order.go
View File

@@ -292,7 +292,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
return nil return nil
} }
func (c *PurchaseHandler) SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) return api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
} }

2
business/partner/purchase/jd/order.go
View File

@@ -216,7 +216,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
return err return err
} }
func (c *PurchaseHandler) SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
_, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID, userName) _, err = api.JdAPI.OrderSerllerDelivery(order.VendorOrderID, userName)
return err return err
} }