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

- add elm client urge msg.

Browse Source
This commit is contained in:
gazebo
2018-07-06 18:07:38 +08:00
parent bed727d3e5
commit 8e07f131cd
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/elm/controller/order.go
View File

@@ -44,7 +44,9 @@ func (o *OrderController) OrderMessage(msg *elmapi.CallbackMsg) (retVal *elmapi.
}
retVal = o.NewOrder(msg, orderID, userMobile)
} else if msg.Type >= elmapi.MsgTypeMerchantValid && msg.Type <= elmapi.MsgTypeOrderFinished {
retVal = o.OrderStatusChanged(msg, orderID)
retVal = o.OrderStatusChanged(msg, orderID, innerMsg)
} else {
retVal = o.OrderOtherMsg(msg, orderID, innerMsg)
}
}, orderID)
@@ -105,7 +107,7 @@ func (o *OrderController) NewOrder(msg *elmapi.CallbackMsg, orderId string, user
return retVal
}
func (o *OrderController) OrderStatusChanged(msg *elmapi.CallbackMsg, orderId string) *elmapi.CallbackResponse {
func (o *OrderController) OrderStatusChanged(msg *elmapi.CallbackMsg, orderId string, innerMsg map[string]interface{}) *elmapi.CallbackResponse {
db := orm.NewOrm()
rec := &models.ELMOrder{
OrderId: orderId,
@@ -133,3 +135,15 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.CallbackMsg, orderId st
}
return elmapi.SuccessResponse
}
func (o *OrderController) OrderOtherMsg(msg *elmapi.CallbackMsg, orderId string, innerMsg map[string]interface{}) *elmapi.CallbackResponse {
var err error
if msg.Type == elmapi.MsgTypeClientUrgeOrder {
err = freshfood.FreshFoodAPI.ELMClientUrgeOrder(orderId)
}
if err != nil {
return errResponseInternal
}
return elmapi.SuccessResponse
}