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

- SelfDeliverDelievered to SelfDeliverDelivered

Browse Source
This commit is contained in:
gazebo
2019-03-27 11:41:02 +08:00
parent 87ea9ff15a
commit 3380d6081a
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,21 +118,21 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName
return err return err
} }
func (c *BaseScheduler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
globals.SugarLogger.Infof("SelfDeliverDelievered orderID:%s", order.VendorOrderID) globals.SugarLogger.Infof("SelfDeliverDelivered orderID:%s", order.VendorOrderID)
if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering { if order.LockStatus == model.OrderStatusUnknown && order.Status == model.OrderStatusDelivering {
if c.IsReallyCallPlatformAPI { if c.IsReallyCallPlatformAPI {
err = utils.CallFuncLogError(func() error { err = utils.CallFuncLogError(func() error {
return partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelievered(order, userName) return partner.GetPurchasePlatformFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName)
}, "SelfDeliverDelievered orderID:%s", order.VendorOrderID) }, "SelfDeliverDelivered orderID:%s", order.VendorOrderID)
} }
} else { } else {
if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusDelivering { if order.LockStatus != model.OrderStatusUnknown || order.Status < model.OrderStatusDelivering {
err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation 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 { } else {
err = scheduler.ErrOrderStatusAlreadySatisfyCurOperation 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 return err

2
business/jxcallback/scheduler/basesch/basesch_ext.go
View File

@@ -42,7 +42,7 @@ func (c *BaseScheduler) SelfDeliveredAndUpdateStatus(ctx *jxcontext.Context, ven
order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID) order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
if err == nil { if err == nil {
if GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore { if GetStoreDeliveryType(order, nil) == scheduler.StoreDeliveryTypeByStore {
err = c.SelfDeliverDelievered(order, userName) err = c.SelfDeliverDelivered(order, userName)
} else { } else {
err = c.Swtich2SelfDelivered(order, userName) err = c.Swtich2SelfDelivered(order, userName)
} }

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

@@ -441,12 +441,12 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID) s.removeWaybillFromMap(savedOrderInfo, bill.WaybillVendorID)
if !s.IsOrderPlatformWaybill(bill) && !isPending { if !s.IsOrderPlatformWaybill(bill) && !isPending {
if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore {
s.SelfDeliverDelievered(order, "") s.SelfDeliverDelivered(order, "")
} else { } else {
s.Swtich2SelfDelivered(order, "") s.Swtich2SelfDelivered(order, "")
} }
} else if s.IsSpecialOrderPlatformWaybill(bill) { } else if s.IsSpecialOrderPlatformWaybill(bill) {
s.SelfDeliverDelievered(savedOrderInfo.order, "") s.SelfDeliverDelivered(savedOrderInfo.order, "")
} }
if !s.isBillCandidate(order, bill) { if !s.isBillCandidate(order, bill) {
// 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达 // 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达

2
business/jxstore/promotion/jd_promotion.go
View File

@@ -371,7 +371,7 @@ func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueW
} }
dao.WrapAddIDCULDEntity(promotion, userName) dao.WrapAddIDCULDEntity(promotion, userName)
// if promotion.Params, err = jxutils.SerializeData(params); err != nil { // if promotion.Params, err = refutil.SerializeData(params); err != nil {
// return "", err // return "", err
// } // }
// promotion.Params = string(utils.MustMarshal(params)) // promotion.Params = string(utils.MustMarshal(params))

6
business/jxutils/dtask/dtask.go
View File

@@ -7,10 +7,10 @@ import (
"time" "time"
"git.rosy.net.cn/baseapi/utils" "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"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals/refutil"
) )
var ( var (
@@ -92,7 +92,7 @@ func (m *DurableTaskMan) AddItem(taskID, objHint string, funcName string, params
TaskIndex: d.data.TotalItem, TaskIndex: d.data.TotalItem,
FinishedAt: utils.DefaultTimeValue, FinishedAt: utils.DefaultTimeValue,
} }
if item.Params, err = jxutils.SerializeData(params); err == nil { if item.Params, err = refutil.SerializeData(params); err == nil {
db := dao.GetDB() db := dao.GetDB()
if err = dao.CreateEntity(db, item); err == nil { if err = dao.CreateEntity(db, item); err == nil {
_, err = dao.UpdateEntity(db, d.data, "TotalItem") _, err = dao.UpdateEntity(db, d.data, "TotalItem")
@@ -115,7 +115,7 @@ func (m *DurableTaskMan) StartTask(taskID string) error {
objValue := reflect.ValueOf(obj) objValue := reflect.ValueOf(obj)
func2Call := objValue.MethodByName(taskItem.FuncName) func2Call := objValue.MethodByName(taskItem.FuncName)
params := []interface{}{} params := []interface{}{}
jxutils.DeSerializeData(taskItem.Params, &params) refutil.DeSerializeData(taskItem.Params, &params)
valueParams := make([]reflect.Value, len(params)) valueParams := make([]reflect.Value, len(params))
for k, v := range params { for k, v := range params {

2
business/partner/partner.go
View File

@@ -89,7 +89,7 @@ type IPurchasePlatformHandler interface {
SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) 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 // Store

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

@@ -200,8 +200,8 @@ 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) {
globals.SugarLogger.Debugf("ebai SelfDeliverDelievered orderID:%s", order.VendorOrderID) globals.SugarLogger.Debugf("ebai SelfDeliverDelivered orderID:%s", order.VendorOrderID)
if globals.EnableEbaiStoreWrite { if globals.EnableEbaiStoreWrite {
err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName) err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
} }

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

@@ -310,7 +310,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
return err 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 { // if globals.EnableElmStoreWrite {
// err = api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) // err = api.ElmAPI.CompleteDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
// } // }

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

@@ -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 { if globals.EnableStoreWrite {
err = c.Swtich2SelfDelivered(order, userName) err = c.Swtich2SelfDelivered(order, userName)
} }

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

@@ -259,7 +259,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
return err 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 { if globals.EnableMtwmStoreWrite {
err = api.MtwmAPI.OrderArrived(utils.Str2Int64(order.VendorOrderID)) err = api.MtwmAPI.OrderArrived(utils.Str2Int64(order.VendorOrderID))
} }

2
business/partner/purchase/weimob/wsc/order.go
View File

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