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

21
controllers/dada_order.go
View File

@@ -2,6 +2,8 @@ package controllers
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller/dada"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/legacy/dada/controller"
"github.com/astaxie/beego"
@@ -24,15 +26,18 @@ func (c *DadaOrderController) URLMapping() {
func (c *DadaOrderController) OrderStatusChanged() {
obj, callbackResponse := api.DadaAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
if callbackResponse == nil {
cc := &controller.OrderController{}
callbackResponse = cc.OrderStatusChanged(obj)
// utils.CallFuncAsync(func() {
// cc2 := &dada.WaybillController{}
// cc2.OnWaybillMsg(obj)
// })
if globals.CallLegacy {
cc := &controller.OrderController{}
callbackResponse = cc.OrderStatusChanged(obj)
}
if globals.CallNew {
utils.CallFuncAsync(func() {
cc2 := &dada.WaybillController{}
cc2.OnWaybillMsg(obj)
})
}
}
if callbackResponse.Code != 200 {
if callbackResponse != nil && callbackResponse.Code != 200 {
c.CustomAbort(callbackResponse.Code, string(utils.MustMarshal(callbackResponse)))
} else {
c.Data["json"] = callbackResponse

20
controllers/elm_order.go
View File

@@ -2,6 +2,9 @@ package controllers
import (
"git.rosy.net.cn/baseapi/platformapi/elmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller/elm"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/legacy/elm/controller"
"github.com/astaxie/beego"
@@ -25,13 +28,16 @@ func (c *ELMOrderController) URLMapping() {
func (c *ELMOrderController) MsgPost() {
obj, callbackResponse := api.ElmAPI.GetCallbackMsg(c.Ctx.Input.RequestBody)
if callbackResponse == nil {
cc := &controller.OrderController{}
callbackResponse = cc.OrderMessage(obj)
// utils.CallFuncAsync(func() {
// cc2 := &elm.Controller{}
// cc2.OnCallbackMsg(obj)
// })
if globals.CallLegacy {
cc := &controller.OrderController{}
callbackResponse = cc.OrderMessage(obj)
}
if globals.CallNew {
utils.CallFuncAsync(func() {
cc2 := &elm.Controller{}
cc2.OnCallbackMsg(obj)
})
}
}
c.Data["json"] = callbackResponse
c.ServeJSON()

37
controllers/jd_order.go
View File

@@ -2,6 +2,9 @@ package controllers
import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller/jd"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/legacy/jd/controller"
"github.com/astaxie/beego"
@@ -34,13 +37,16 @@ func (c *JDOrderController) orderStatus(isCancelOrder bool) {
obj, callbackResponse = api.JdAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
}
if callbackResponse == nil {
cc := controller.OrderController{}
callbackResponse = cc.OrderStatus(obj)
// utils.CallFuncAsync(func() {
// cc2 := &jd.OrderController{}
// cc2.OnOrderMsg(obj)
// })
if globals.CallLegacy {
cc := controller.OrderController{}
callbackResponse = cc.OrderStatus(obj)
}
if globals.CallNew {
utils.CallFuncAsync(func() {
cc2 := &jd.OrderController{}
cc2.OnOrderMsg(obj)
})
}
}
c.Data["json"] = callbackResponse
c.ServeJSON()
@@ -145,13 +151,16 @@ func (c *JDOrderController) ApplyCancelOrder() {
func (c *JDOrderController) PushDeliveryStatus() {
obj, callbackResponse := api.JdAPI.GetOrderDeliveryCallbackMsg(c.Ctx.Input.RequestBody)
if callbackResponse == nil {
cc := controller.OrderController{}
callbackResponse = cc.OrderDeliveryStatus(obj)
// utils.CallFuncAsync(func() {
// cc2 := &jd.WaybillController{}
// cc2.OnWaybillMsg(obj)
// })
if globals.CallLegacy {
cc := controller.OrderController{}
callbackResponse = cc.OrderDeliveryStatus(obj)
}
if globals.CallNew {
utils.CallFuncAsync(func() {
cc2 := &jd.WaybillController{}
cc2.OnWaybillMsg(obj)
})
}
}
c.Data["json"] = callbackResponse
c.ServeJSON()

37
controllers/mtps_order.go
View File

@@ -1,6 +1,9 @@
package controllers
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/controller/mtps"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/legacy/mtps/controller"
"github.com/astaxie/beego"
@@ -24,13 +27,16 @@ func (c *MTPSOrderController) URLMapping() {
func (c *MTPSOrderController) Status() {
obj, callbackResponse := api.MtpsAPI.GetOrderCallbackMsg(c.Ctx.Request)
if callbackResponse == nil {
cc := &controller.OrderController{}
callbackResponse = cc.OrderStatusChanged(obj)
// utils.CallFuncAsync(func() {
// cc2 := &mtps.WaybillController{}
// cc2.OnWaybillMsg(obj)
// })
if globals.CallLegacy {
cc := &controller.OrderController{}
callbackResponse = cc.OrderStatusChanged(obj)
}
if globals.CallNew {
utils.CallFuncAsync(func() {
cc2 := &mtps.WaybillController{}
cc2.OnWaybillMsg(obj)
})
}
}
c.Data["json"] = callbackResponse
c.ServeJSON()
@@ -44,13 +50,16 @@ func (c *MTPSOrderController) Status() {
func (c *MTPSOrderController) Except() {
obj, callbackResponse := api.MtpsAPI.GetOrderExceptionCallbackMsg(c.Ctx.Request)
if callbackResponse == nil {
cc := &controller.OrderController{}
callbackResponse = cc.OrderException(obj)
// utils.CallFuncAsync(func() {
// cc2 := &mtps.WaybillController{}
// cc2.OnWaybillExcept(obj)
// })
if globals.CallLegacy {
cc := &controller.OrderController{}
callbackResponse = cc.OrderException(obj)
}
if globals.CallNew {
utils.CallFuncAsync(func() {
cc2 := &mtps.WaybillController{}
cc2.OnWaybillExcept(obj)
})
}
}
c.Data["json"] = callbackResponse
c.ServeJSON()