- big big refactor.

This commit is contained in:
gazebo
2018-07-12 14:41:40 +08:00
parent ac2d4214e5
commit 6386f1b6f5
18 changed files with 687 additions and 644 deletions

View File

@@ -8,80 +8,49 @@ import (
)
type WaybillController struct {
controller.WaybillController
}
func init() {
controller.OrderManager.RegisterDeliveryPlatform(controller.VendorIDDada, new(WaybillController))
}
func (c *WaybillController) OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
controller.RoutinePool.CallFun(func() {
controller.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg)
}, msg.OrderID)
return retVal
}
func (c *WaybillController) callbackMsg2Status(msg *dadaapi.CallbackMsg) *model.OrderStatus {
orderStatus := &model.OrderStatus{
VendorOrderID: msg.ClientID,
VendorID: controller.VendorIDDada,
OrderType: controller.OrderTypeWaybill,
VendorStatus: utils.Int2Str(msg.OrderStatus),
StatusTime: utils.Timestamp2Time(int64(msg.UpdateTime)),
}
return orderStatus
}
func (c *WaybillController) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
order := c.callbackMsg2Waybill(msg)
switch msg.OrderStatus {
case dadaapi.OrderStatusWaitingForAccept:
retVal = c.onWaybillNew(msg)
order.Status = controller.WaybillStatusNew
case dadaapi.OrderStatusAccepted:
retVal = c.onWaybillAccepted(msg)
order.Status = controller.WaybillStatusAccepted
case dadaapi.OrderStatusDeliverying:
retVal = c.onWaybillDelivering(msg)
order.Status = controller.WaybillStatusDelivering
case dadaapi.OrderStatusFinished:
retVal = c.onWaybillDelivered(msg)
order.Status = controller.WaybillStatusDelivered
case dadaapi.OrderStatusCanceled:
retVal = c.onWaybillCanceled(msg)
order.Status = controller.WaybillStatusCanceled
case dadaapi.OrderStatusExpired, dadaapi.OrderStatusAddOrderFailed:
retVal = c.onWaybillFailed(msg)
order.Status = controller.WaybillStatusFailed
default:
retVal = c.onWaybillOtherStatus(msg)
order.Status = controller.WaybillStatusUnknown
}
return retVal
return dadaapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), utils.Int2Str(order.Status))
}
func (c *WaybillController) onWaybillNew(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
order := &model.Waybill{
VendorOrderID: msg.OrderID,
VendorID: controller.GetVendorIDFromUniversalOrderID(msg.OrderID),
func (c *WaybillController) callbackMsg2Waybill(msg *dadaapi.CallbackMsg) (retVal *model.Waybill) {
retVal = &model.Waybill{
VendorWaybillID: msg.ClientID,
WaybillVendorID: controller.VendorIDDada,
CourierName: msg.DmName,
CourierMobile: msg.DmMobile,
VendorStatus: utils.Int2Str(msg.OrderStatus),
WaybillCreatedAt: utils.Timestamp2Time(int64(msg.UpdateTime)),
}
return dadaapi.Err2CallbackResponse(c.OnWaybillNew(order), "dada onWaybillNew")
}
func (c *WaybillController) onWaybillAccepted(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
return dadaapi.Err2CallbackResponse(c.OnWaybillAccepted(c.callbackMsg2Status(msg)), "dada onWaybillAccepted")
}
func (c *WaybillController) onWaybillDelivering(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
return dadaapi.Err2CallbackResponse(c.OnWaybillDelivering(c.callbackMsg2Status(msg)), "dada onWaybillDelivering")
}
func (c *WaybillController) onWaybillDelivered(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
return dadaapi.Err2CallbackResponse(c.OnWaybillDelivered(c.callbackMsg2Status(msg)), "dada onWaybillDelivered")
}
func (c *WaybillController) onWaybillCanceled(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
return dadaapi.Err2CallbackResponse(c.OnWaybillCanceled(c.callbackMsg2Status(msg)), "dada onWaybillCanceled")
}
func (c *WaybillController) onWaybillFailed(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
return dadaapi.Err2CallbackResponse(c.OnWaybillFailed(c.callbackMsg2Status(msg)), "dada onWaybillFailed")
}
func (c *WaybillController) onWaybillOtherStatus(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) {
return dadaapi.Err2CallbackResponse(c.OnWaybillOtherStatus(c.callbackMsg2Status(msg)), "dada onWaybillOtherStatus")
retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
return retVal
}