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

- use ebai api to controll order flow.

Browse Source
This commit is contained in:
gazebo
2018-11-19 09:45:14 +08:00
parent ab5013e7a9
commit 743f2c5588
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -466,7 +466,7 @@ func (s *DefScheduler) removeWaybillFromMap(savedOrderInfo *WatchOrderInfo, wayb
func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, excludeBill *model.Waybill) (err error) { func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInfo, excludeBill *model.Waybill) (err error) {
order := savedOrderInfo.order order := savedOrderInfo.order
globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d, excludeBill:%v", order.VendorOrderID, order.Status, excludeBill) globals.SugarLogger.Debugf("createWaybillOn3rdProviders, orderID:%s, status:%d, excludeBill:%v", order.VendorOrderID, order.Status, excludeBill)
if order.VendorID == model.VendorIDEBAI { if order.VendorID == model.VendorIDELM {
return nil return nil
} }
if order.WaybillVendorID == model.VendorIDUnknown { if order.WaybillVendorID == model.VendorIDUnknown {

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

@@ -137,40 +137,45 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
} }
func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { globals.SugarLogger.Debugf("ebai PickupGoods orderID:%s", order.VendorOrderID)
// err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID) if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
// } err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID)
}
p.postFakeFinishedPickupMsg(order.VendorOrderID) // 饿百没有拣货完成事件，模拟发送 p.postFakeFinishedPickupMsg(order.VendorOrderID) // 饿百没有拣货完成事件，模拟发送
return err return err
} }
// 将订单从购物平台配送转为自送 // 将订单从购物平台配送转为自送
func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { globals.SugarLogger.Debugf("ebai Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
// err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID) if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
// } err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID)
}
return err return err
} }
// 将订单从购物平台配送转为自送后又送达 // 将订单从购物平台配送转为自送后又送达
func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
globals.SugarLogger.Debugf("ebai Swtich2SelfDelivered orderID:%s", order.VendorOrderID)
// todo 饿百转商家自送后，没有确认送达的概念，空操作 // todo 饿百转商家自送后，没有确认送达的概念，空操作
return err return err
} }
// 完全自送的门店表示开始配送 // 完全自送的门店表示开始配送
func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { globals.SugarLogger.Debugf("ebai SelfDeliverDelivering orderID:%s", order.VendorOrderID)
// err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName) if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
// } err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
}
return err return err
} }
// 完全自送的门店表示配送完成 // 完全自送的门店表示配送完成
func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) {
// if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite { globals.SugarLogger.Debugf("ebai SelfDeliverDelievered orderID:%s", order.VendorOrderID)
// err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName) if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
// } err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
}
return err return err
} }

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

@@ -285,9 +285,9 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string)
} }
func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableElmStoreWrite { // if globals.EnableElmStoreWrite {
err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID) // err = api.ElmAPI.DeliveryBySelfLite(order.VendorOrderID)
} // }
return err return err
} }
@@ -297,16 +297,16 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
} }
func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
if globals.EnableElmStoreWrite { // if globals.EnableElmStoreWrite {
err = api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile) // err = api.ElmAPI.StartDeliveryBySelf(order.VendorOrderID, order.ConsigneeMobile)
} // }
return err return err
} }
func (c *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) { func (c *PurchaseHandler) SelfDeliverDelievered(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)
} // }
return err return err
} }