From 3380d6081a513fbbe80a87cce8fb4a7a246bd18b Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 27 Mar 2019 11:41:02 +0800 Subject: [PATCH] - SelfDeliverDelievered to SelfDeliverDelivered --- business/jxcallback/scheduler/basesch/basesch.go | 12 ++++++------ business/jxcallback/scheduler/basesch/basesch_ext.go | 2 +- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- business/jxstore/promotion/jd_promotion.go | 2 +- business/jxutils/dtask/dtask.go | 6 +++--- business/partner/partner.go | 2 +- business/partner/purchase/ebai/order.go | 4 ++-- business/partner/purchase/elm/order.go | 2 +- business/partner/purchase/jd/order.go | 2 +- business/partner/purchase/mtwm/order.go | 2 +- business/partner/purchase/weimob/wsc/order.go | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index d2955b90f..5ce47fefb 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -118,21 +118,21 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName return err } -func (c *BaseScheduler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { - globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s", order.VendorOrderID) +func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Infof("SelfDeliverDelivered orderID:%s", order.VendorOrderID) if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogError(func() error { - return partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order, userName) - }, "SelfDeliverDelievered orderID:%s", order.VendorOrderID) + return partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName) + }, "SelfDeliverDelivered orderID:%s", order.VendorOrderID) } } else { if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusDelivering { err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation - globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status) + globals.SugarLogger.Infof("SelfDeliverDelivered orderID:%s, status:%d is not suitable", order.VendorOrderID, order.Status) } else { err = scheduler.ErrOrderStatusAlreadySatisfyCurOperation - globals.SugarLogger.Debugf("SelfDeliverDelievered orderID:%s, status:%d already ok", order.VendorOrderID, order.Status) + globals.SugarLogger.Debugf("SelfDeliverDelivered orderID:%s, status:%d already ok", order.VendorOrderID, order.Status) } } return err diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index db6ab9818..e1baaa057 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -42,7 +42,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) if err == nil { if GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore { - err = c.SelfDeliverDelievered(order, userName) + err = c.SelfDeliverDelivered(order, userName) } else { err = c.Swtich2SelfDelivered(order, userName) } diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index bcfaa64cd..f6a15b2ed 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -441,12 +441,12 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID) if !s.IsOrderPlatformWaybill(bill) && !isPending { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { - s.SelfDeliverDelievered(order, "") + s.SelfDeliverDelivered(order, "") } else { s.Swtich2SelfDelivered(order, "") } } else if s.IsSpecialOrderPlatformWaybill(bill) { - s.SelfDeliverDelievered(savedOrderInfo.order, "") + s.SelfDeliverDelivered(savedOrderInfo.order, "") } if !s.isBillCandidate(order, bill) { // 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达 diff --git a/business/jxstore/promotion/jd_promotion.go b/business/jxstore/promotion/jd_promotion.go index 4423c119b..11f41b020 100644 --- a/business/jxstore/promotion/jd_promotion.go +++ b/business/jxstore/promotion/jd_promotion.go @@ -371,7 +371,7 @@ func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueW } dao.WrapAddIDCULDEntity(promotion, userName) - // if promotion.Params, err = jxutils.SerializeData(params); err != nil { + // if promotion.Params, err = refutil.SerializeData(params); err != nil { // return "", err // } // promotion.Params = string(utils.MustMarshal(params)) diff --git a/business/jxutils/dtask/dtask.go b/business/jxutils/dtask/dtask.go index d7e6e63f1..36d3dd597 100644 --- a/business/jxutils/dtask/dtask.go +++ b/business/jxutils/dtask/dtask.go @@ -7,10 +7,10 @@ import ( "time" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" + "git.rosy.net.cn/jx-callback/globals/refutil" ) var ( @@ -92,7 +92,7 @@ func (m *DurableTaskMan) AddItem(taskID, objHint string, funcName string, params TaskIndex: d.data.TotalItem, FinishedAt: utils.DefaultTimeValue, } - if item.Params, err = jxutils.SerializeData(params); err == nil { + if item.Params, err = refutil.SerializeData(params); err == nil { db := dao.GetDB() if err = dao.CreateEntity(db, item); err == nil { _, err = dao.UpdateEntity(db, d.data, "TotalItem") @@ -115,7 +115,7 @@ func (m *DurableTaskMan) StartTask(taskID string) error { objValue := reflect.ValueOf(obj) func2Call := objValue.MethodByName(taskItem.FuncName) params := []interface{}{} - jxutils.DeSerializeData(taskItem.Params, ¶ms) + refutil.DeSerializeData(taskItem.Params, ¶ms) valueParams := make([]reflect.Value, len(params)) for k, v := range params { diff --git a/business/partner/partner.go b/business/partner/partner.go index 6cf61ee7b..06376a7be 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -89,7 +89,7 @@ type IPurchasePlatformHandler interface { SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) // 完全自送的门店表示配送完成 - SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) + SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) //////// // Store diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 34992576e..610391b68 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -200,8 +200,8 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam } // 完全自送的门店表示配送完成 -func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { - globals.SugarLogger.Debugf("ebai SelfDeliverDelievered orderID:%s", order.VendorOrderID) +func (p *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { + globals.SugarLogger.Debugf("ebai SelfDeliverDelivered orderID:%s", order.VendorOrderID) if globals.EnableEbaiStoreWrite { err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName) } diff --git a/business/partner/purchase/elm/order.go b/business/partner/purchase/elm/order.go index d7314f1bf..77432d8b2 100644 --- a/business/partner/purchase/elm/order.go +++ b/business/partner/purchase/elm/order.go @@ -310,7 +310,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam return err } -func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { +func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { // if globals.EnableElmStoreWrite { // err = api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) // } diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go index 783905e9b..2260511d5 100644 --- a/business/partner/purchase/jd/order.go +++ b/business/partner/purchase/jd/order.go @@ -298,7 +298,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam } // 京东送达接口都是一样的 -func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { +func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { if globals.EnableStoreWrite { err = c.Swtich2SelfDelivered(order, userName) } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index c25a6d738..43ecb53dc 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -259,7 +259,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam return err } -func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { +func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { if globals.EnableMtwmStoreWrite { err = api.MtwmAPI.OrderArrived(utils.Str2Int64(order.VendorOrderID)) } diff --git a/business/partner/purchase/weimob/wsc/order.go b/business/partner/purchase/weimob/wsc/order.go index 52ffa1a1a..bb83c6f10 100644 --- a/business/partner/purchase/weimob/wsc/order.go +++ b/business/partner/purchase/weimob/wsc/order.go @@ -228,7 +228,7 @@ func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam } // 完全自送的门店表示配送完成 -func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { +func (p *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { return err }