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

- big big refactor.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

70
business/controller/jd/waybill.go
View File

@@ -8,80 +8,52 @@ import (
)
type WaybillController struct {
controller.WaybillController
}
func init() {
controller.WaybillManager.RegisterDeliveryProvider(controller.VendorIDJD, new(WaybillController))
}
func (c *WaybillController) OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
controller.RoutinePool.CallFun(func() {
controller.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg)
}, msg.OrderID)
return retVal
}
func (c *WaybillController) callbackMsg2Status(msg *jdapi.CallbackDeliveryStatusMsg) *model.OrderStatus {
status := &model.OrderStatus{
VendorOrderID: msg.OrderID,
VendorID: controller.VendorIDJD,
OrderType: controller.OrderTypeWaybill,
VendorStatus: msg.DeliveryStatus,
StatusTime: utils.Str2Time(msg.DeliveryStatusTime),
}
return status
}
func (c *WaybillController) onWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
order := c.callbackMsg2Waybill(msg)
switch msg.DeliveryStatus {
case jdapi.DeliveryStatusWait4Grap:
retVal = c.onWaybillNew(msg)
order.Status = controller.WaybillStatusNew
case jdapi.DeliveryStatusAccepted:
retVal = c.onWaybillAccepted(msg)
order.Status = controller.WaybillStatusAccepted
case jdapi.DeliveryStatusCourierCanceled:
retVal = c.onWaybillAcceptCanceled(msg)
order.Status = controller.WaybillStatusCanceled
case jdapi.DeliveryStatusCourierArrived:
order.Status = controller.WaybillStatusCourierArrived
case jdapi.DeliveryStatusGotGoods:
retVal = c.onWaybillGotGoods(msg)
order.Status = controller.WaybillStatusDelivering
case jdapi.DeliveryStatusFinished:
retVal = c.onWaybillFinished(msg)
order.Status = controller.WaybillStatusDelivered
case jdapi.DeliveryStatusFailedDelivery:
retVal = c.onWaybillFailed(msg)
order.Status = controller.WaybillStatusFailed
default:
retVal = c.onWaybillOtherStatus(msg)
order.Status = controller.WaybillStatusUnknown
}
return retVal
return jdapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), order.VendorStatus)
}
func (c *WaybillController) onWaybillNew(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
order := &model.Waybill{
func (c *WaybillController) callbackMsg2Waybill(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *model.Waybill) {
retVal = &model.Waybill{
VendorOrderID: msg.OrderID,
VendorID: controller.VendorIDJD,
OrderVendorID: controller.VendorIDJD,
VendorWaybillID: msg.OrderID,
WaybillVendorID: controller.VendorIDJD,
CourierName: msg.DeliveryManName,
CourierMobile: msg.DeliveryManPhone,
VendorStatus: msg.DeliveryStatus,
WaybillCreatedAt: utils.Str2Time(msg.DeliveryStatusTime),
}
return jdapi.Err2CallbackResponse(c.OnWaybillNew(order), "jd onWaybillNew")
}
func (c *WaybillController) onWaybillAccepted(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
return jdapi.Err2CallbackResponse(c.OnWaybillAccepted(c.callbackMsg2Status(msg)), "jd onWaybillAccepted")
}
func (c *WaybillController) onWaybillAcceptCanceled(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
return jdapi.Err2CallbackResponse(c.OnWaybillAcceptCanceled(c.callbackMsg2Status(msg)), "jd onWaybillAcceptCanceled")
}
func (c *WaybillController) onWaybillGotGoods(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
return jdapi.Err2CallbackResponse(c.OnWaybillDelivering(c.callbackMsg2Status(msg)), "jd onWaybillGotGoods")
}
func (c *WaybillController) onWaybillFinished(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
return jdapi.Err2CallbackResponse(c.OnWaybillDelivered(c.callbackMsg2Status(msg)), "jd onWaybillFinished")
}
func (c *WaybillController) onWaybillFailed(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
return jdapi.Err2CallbackResponse(c.OnWaybillFailed(c.callbackMsg2Status(msg)), "jd onWaybillFailed")
}
func (c *WaybillController) onWaybillOtherStatus(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackResponse) {
return jdapi.Err2CallbackResponse(c.OnWaybillOtherStatus(c.callbackMsg2Status(msg)), "jd onWaybillOtherStatus")
return retVal
}