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

- empty scheduler added.

Browse Source
This commit is contained in:
gazebo
2018-07-12 20:53:22 +08:00
parent 1c6ba2e43a
commit 52248ca427
13 changed files with 338 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
business/controller/dada/waybill.go
View File

@@ -5,13 +5,14 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/scheduler"
)
type WaybillController struct {
}
func init() {
controller.OrderManager.RegisterDeliveryPlatform(controller.VendorIDDada, new(WaybillController))
scheduler.CurrentScheduler.RegisterDeliveryPlatform(model.VendorIDDada, new(WaybillController))
}
func (c *WaybillController) OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
@@ -25,19 +26,19 @@ func (c *WaybillController) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dada
order := c.callbackMsg2Waybill(msg)
switch msg.OrderStatus {
case dadaapi.OrderStatusWaitingForAccept:
order.Status = controller.WaybillStatusNew
order.Status = model.WaybillStatusNew
case dadaapi.OrderStatusAccepted:
order.Status = controller.WaybillStatusAccepted
order.Status = model.WaybillStatusAccepted
case dadaapi.OrderStatusDeliverying:
order.Status = controller.WaybillStatusDelivering
order.Status = model.WaybillStatusDelivering
case dadaapi.OrderStatusFinished:
order.Status = controller.WaybillStatusDelivered
order.Status = model.WaybillStatusDelivered
case dadaapi.OrderStatusCanceled:
order.Status = controller.WaybillStatusCanceled
order.Status = model.WaybillStatusCanceled
case dadaapi.OrderStatusExpired, dadaapi.OrderStatusAddOrderFailed:
order.Status = controller.WaybillStatusFailed
order.Status = model.WaybillStatusFailed
default:
order.Status = controller.WaybillStatusUnknown
order.Status = model.WaybillStatusUnknown
}
return dadaapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status))
}
@@ -45,7 +46,7 @@ func (c *WaybillController) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dada
func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal *model.Waybill) {
retVal = &model.Waybill{
VendorWaybillID: msg.ClientID,
WaybillVendorID: controller.VendorIDDada,
WaybillVendorID: model.VendorIDDada,
CourierName: msg.DmName,
CourierMobile: msg.DmMobile,
VendorStatus: utils.Int2Str(msg.OrderStatus),
@@ -54,3 +55,12 @@ func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVa
retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
return retVal
}
//
func (c *WaybillController) CreateWaybill(bill *model.Waybill) (err error) {
return nil
}
func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) {
return nil
}