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

- record order ok.

Browse Source
This commit is contained in:
gazebo
2018-07-10 19:06:51 +08:00
parent a76213e8f0
commit c6a3066daf
14 changed files with 143 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
controllers/jd_order.go
View File

@@ -1,6 +1,7 @@
package controllers
import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/legacy/jd/controller"
"github.com/astaxie/beego"
@@ -23,11 +24,23 @@ func (c *JDOrderController) URLMapping() {
c.Mapping("PushDeliveryStatus", c.PushDeliveryStatus)
}
func (c *JDOrderController) orderStatus() {
obj, callbackResponse := api.Jdapi.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
func (c *JDOrderController) orderStatus(isCancelOrder bool) {
var obj *jdapi.CallbackOrderMsg
var callbackResponse *jdapi.CallbackResponse
if isCancelOrder {
obj, callbackResponse = api.JdAPI.GetOrderApplyCancelCallbackMsg(c.Ctx.Input.RequestBody)
} else {
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)
// })
}
c.Data["json"] = callbackResponse
c.ServeJSON()
@@ -40,7 +53,7 @@ func (c *JDOrderController) orderStatus() {
// @Failure 403 body is empty
// @router /newOrder [post]
func (c *JDOrderController) NewOrder() {
c.orderStatus()
c.orderStatus(false)
}
// @Title AdjustOrder
@@ -50,7 +63,7 @@ func (c *JDOrderController) NewOrder() {
// @Failure 403 body is empty
// @router /orderAdjust [post]
func (c *JDOrderController) OrderAdjust() {
c.orderStatus()
c.orderStatus(false)
}
// @Title orderWaitOutStore
@@ -60,7 +73,7 @@ func (c *JDOrderController) OrderAdjust() {
// @Failure 403 body is empty
// @router /orderWaitOutStore [post]
func (c *JDOrderController) OrderWaitOutStore() {
c.orderStatus()
c.orderStatus(false)
}
// @Title pickFinishOrder
@@ -70,7 +83,7 @@ func (c *JDOrderController) OrderWaitOutStore() {
// @Failure 403 body is empty
// @router /pickFinishOrder [post]
func (c *JDOrderController) PickFinishOrder() {
c.orderStatus()
c.orderStatus(false)
}
// @Title deliveryOrder
@@ -80,7 +93,7 @@ func (c *JDOrderController) PickFinishOrder() {
// @Failure 403 body is empty
// @router /deliveryOrder [post]
func (c *JDOrderController) DeliveryOrder() {
c.orderStatus()
c.orderStatus(false)
}
// @Title finishOrder
@@ -90,7 +103,7 @@ func (c *JDOrderController) DeliveryOrder() {
// @Failure 403 body is empty
// @router /finishOrder [post]
func (c *JDOrderController) FinishOrder() {
c.orderStatus()
c.orderStatus(false)
}
// @Title lockOrder
@@ -100,7 +113,7 @@ func (c *JDOrderController) FinishOrder() {
// @Failure 403 body is empty
// @router /lockOrder [post]
func (c *JDOrderController) LockOrder() {
c.orderStatus()
c.orderStatus(false)
}
// @Title userCancelOrder
@@ -110,7 +123,7 @@ func (c *JDOrderController) LockOrder() {
// @Failure 403 body is empty
// @router /userCancelOrder [post]
func (c *JDOrderController) UserCancelOrder() {
c.orderStatus()
c.orderStatus(false)
}
// @Title applyCancelOrder
@@ -120,13 +133,7 @@ func (c *JDOrderController) UserCancelOrder() {
// @Failure 403 body is empty
// @router /applyCancelOrder [post]
func (c *JDOrderController) ApplyCancelOrder() {
obj, callbackResponse := api.Jdapi.GetOrderApplyCancelCallbackMsg(c.Ctx.Input.RequestBody)
if callbackResponse == nil {
cc := controller.OrderController{}
callbackResponse = cc.OrderStatus(obj)
}
c.Data["json"] = callbackResponse
c.ServeJSON()
c.orderStatus(true)
}
// @Title pushDeliveryStatus
@@ -136,10 +143,15 @@ func (c *JDOrderController) ApplyCancelOrder() {
// @Failure 403 body is empty
// @router /pushDeliveryStatus [post]
func (c *JDOrderController) PushDeliveryStatus() {
obj, callbackResponse := api.Jdapi.GetOrderDeliveryCallbackMsg(c.Ctx.Input.RequestBody)
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)
// })
}
c.Data["json"] = callbackResponse
c.ServeJSON()
@@ -152,5 +164,5 @@ func (c *JDOrderController) PushDeliveryStatus() {
// @Failure 403 body is empty
// @router /orderCommentPush [post]
func (c *JDOrderController) OrderComment() {
c.orderStatus()
c.orderStatus(false)
}