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

79
business/controller/mtps/waybill.go
View File

@@ -9,86 +9,67 @@ import (
)
type WaybillController struct {
controller.WaybillController
}
func init() {
controller.OrderManager.RegisterDeliveryPlatform(controller.VendorIDMTPS, new(WaybillController))
}
func (c *WaybillController) OnWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
controller.RoutinePool.CallFun(func() {
controller.CallMsgHandler(func() {
retVal = c.onWaybillMsg(msg)
}, msg.MtPeisongID)
return retVal
}
func (c *WaybillController) OnWaybillExcept(msg *mtpsapi.CallbackOrderExceptionMsg) (retVal *mtpsapi.CallbackResponse) {
controller.RoutinePool.CallFun(func() {
status := &model.OrderStatus{
VendorOrderID: msg.MtPeisongID,
VendorID: controller.VendorIDMTPS,
OrderType: controller.OrderTypeWaybill,
VendorStatus: utils.Int2Str(msg.ExceptionCode),
StatusTime: utils.Timestamp2Time(int64(msg.Timestamp)),
controller.CallMsgHandler(func() {
order := &model.Waybill{
VendorWaybillID: msg.MtPeisongID,
VendorWaybillID2: utils.Int64ToStr(msg.DeliveryID),
WaybillVendorID: controller.VendorIDMTPS,
CourierName: msg.CourierName,
CourierMobile: msg.CourierPhone,
Status: controller.WaybillStatusFailed,
VendorStatus: utils.Int2Str(msg.ExceptionCode),
WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
}
retVal = mtpsapi.Err2CallbackResponse(c.OnWaybillFailed(status), "mtps OnWaybillExcept")
order.VendorOrderID, order.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
retVal = mtpsapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), "mtps OnWaybillExcept")
}, msg.MtPeisongID)
return retVal
}
func (c *WaybillController) callbackMsg2Status(msg *mtpsapi.CallbackOrderMsg) *model.OrderStatus {
status := &model.OrderStatus{
VendorOrderID: msg.MtPeisongID,
VendorID: controller.VendorIDMTPS,
OrderType: controller.OrderTypeWaybill,
VendorStatus: utils.Int2Str(msg.Status),
StatusTime: utils.Timestamp2Time(int64(msg.Timestamp)),
}
return status
}
func (c *WaybillController) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
order := c.callbackMsg2Waybill(msg)
switch msg.Status {
case mtpsapi.OrderStatusWaitingForSchedule:
retVal = c.onWaybillNew(msg)
order.Status = controller.WaybillStatusNew
case mtpsapi.OrderStatusAccepted:
retVal = c.onWaybillAccepted(msg)
order.Status = controller.WaybillStatusAccepted
case mtpsapi.OrderStatusPickedUp:
retVal = c.onWaybillPickedUp(msg)
order.Status = controller.WaybillStatusDelivering
case mtpsapi.OrderStatusDeliverred:
retVal = c.onWaybillDelivered(msg)
order.Status = controller.WaybillStatusDelivered
case mtpsapi.OrderStatusCanceled:
retVal = c.onWaybillCanceled(msg)
order.Status = controller.WaybillStatusCanceled
default:
globals.SugarLogger.Warnf("unknown msg:%v", msg)
retVal = mtpsapi.SuccessResponse
return mtpsapi.SuccessResponse
}
return retVal
return mtpsapi.Err2CallbackResponse(controller.WaybillManager.OnWaybillStatusChanged(order), order.VendorStatus)
}
func (c *WaybillController) onWaybillNew(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
order := &model.Waybill{
VendorOrderID: msg.OrderID,
VendorID: controller.GetVendorIDFromUniversalOrderID(msg.OrderID),
func (c *WaybillController) callbackMsg2Waybill(msg *mtpsapi.CallbackOrderMsg) (retVal *model.Waybill) {
retVal = &model.Waybill{
VendorWaybillID: msg.MtPeisongID,
VendorWaybillID2: utils.Int64ToStr(msg.DeliveryID),
WaybillVendorID: controller.VendorIDMTPS,
CourierName: msg.CourierName,
CourierMobile: msg.CourierPhone,
VendorStatus: utils.Int2Str(msg.Status),
WaybillCreatedAt: utils.Timestamp2Time(msg.Timestamp),
}
return mtpsapi.Err2CallbackResponse(c.OnWaybillNew(order), "mtps onWaybillNew")
}
func (c *WaybillController) onWaybillAccepted(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
return mtpsapi.Err2CallbackResponse(c.OnWaybillAccepted(c.callbackMsg2Status(msg)), "mtps onWaybillAccepted")
}
func (c *WaybillController) onWaybillPickedUp(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
return mtpsapi.Err2CallbackResponse(c.OnWaybillDelivering(c.callbackMsg2Status(msg)), "mtps onWaybillPickedUp")
}
func (c *WaybillController) onWaybillDelivered(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
return mtpsapi.Err2CallbackResponse(c.OnWaybillDelivered(c.callbackMsg2Status(msg)), "mtps onWaybillDelivered")
}
func (c *WaybillController) onWaybillCanceled(msg *mtpsapi.CallbackOrderMsg) (retVal *mtpsapi.CallbackResponse) {
return mtpsapi.Err2CallbackResponse(c.OnWaybillCanceled(c.callbackMsg2Status(msg)), "mtps onWaybillCanceled")
retVal.VendorOrderID, retVal.OrderVendorID = controller.SplitUniversalOrderID(msg.OrderID)
return retVal
}