diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 1a37ab528..5028de578 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -135,13 +135,13 @@ func (c *BaseScheduler) Swtich2SelfDelivered(order *model.GoodsOrder, userName s return err } -func (c *BaseScheduler) SelfDeliverDelievering(order *model.GoodsOrder, userName string) (err error) { - globals.SugarLogger.Infof("SelfDeliverDelievering orderID:%s", order.VendorOrderID) +func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Infof("SelfDeliverDelivering orderID:%s", order.VendorOrderID) if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusFinishedPickup { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogError(func() error { - return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievering(order, userName) - }, "SelfDeliverDelievering orderID:%s", order.VendorOrderID) + return c.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivering(order, userName) + }, "SelfDeliverDelivering orderID:%s", order.VendorOrderID) if err == nil { // 因为有些平台设置配送中后,不会发送订单在配送中消息过来,所以成功后就强制设置状态为配送中 order.Status = model.OrderStatusDelivering } @@ -149,10 +149,10 @@ func (c *BaseScheduler) SelfDeliverDelievering(order *model.GoodsOrder, userName } else { if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusFinishedPickup { 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 { 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 diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 6c425b4cd..fd7742021 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -316,7 +316,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo s.cancelOtherWaybills(savedOrderInfo, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) if bill.WaybillVendorID != bill.OrderVendorID { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { - s.SelfDeliverDelievering(savedOrderInfo.order, "") + s.SelfDeliverDelivering(savedOrderInfo.order, "") } else { s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, 2, 10*time.Second) } diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index fb766c585..924f9725f 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -21,7 +21,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(vendorOrderID string, vendo if err == nil { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { if order.Status <= model.OrderStatusFinishedPickup { - err = s.SelfDeliverDelievering(order, "") + err = s.SelfDeliverDelivering(order, "") } } else { if order.Status <= model.OrderStatusFinishedPickup { diff --git a/business/partner/partner.go b/business/partner/partner.go index 579e4af12..ffd7b6bce 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -62,7 +62,7 @@ type IPurchasePlatformHandler interface { 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) diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 673ed319f..d48681261 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -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) return err } diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index a6920b80f..fe4e8d881 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -292,7 +292,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName 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) } diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 57ef30953..1bc78a03b 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -216,7 +216,7 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName 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) return err }