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

- first compilable version of order handler.

Browse Source
This commit is contained in:
gazebo
2018-07-10 13:37:35 +08:00
parent 49ec11baf8
commit a76213e8f0
15 changed files with 1319 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ func (o *OrderController) OrderMessage(msg *elmapi.CallbackMsg) (retVal *elmapi.
baseapi.SugarLogger.Warnf("elm can not get mobile info from %v, error:%v", msg, err)
}
retVal = o.NewOrder(msg, orderID, userMobile)
} else if msg.Type >= elmapi.MsgTypeMerchantValid && msg.Type <= elmapi.MsgTypeOrderFinished {
} else if msg.Type >= elmapi.MsgTypeOrderAccepted && msg.Type <= elmapi.MsgTypeOrderFinished {
retVal = o.OrderStatusChanged(msg, orderID, innerMsg)
} else {
retVal = o.OrderOtherMsg(msg, orderID, innerMsg)
@@ -138,7 +138,7 @@ func (o *OrderController) OrderStatusChanged(msg *elmapi.CallbackMsg, orderId st
func (o *OrderController) OrderOtherMsg(msg *elmapi.CallbackMsg, orderId string, innerMsg map[string]interface{}) *elmapi.CallbackResponse {
var err error
if msg.Type == elmapi.MsgTypeClientUrgeOrder {
if msg.Type == elmapi.MsgTypeUserUrgeOrder {
err = freshfood.FreshFoodAPI.ELMClientUrgeOrder(orderId)
}

6
legacy/freshfood/freshfood.go
View File

@@ -113,7 +113,7 @@ func init() {
}
func New(baseURL string) *API {
return &API{baseURL, &http.Client{Timeout: time.Second * 20}}
return &API{baseURL, &http.Client{Timeout: time.Second * 5}}
}
func (f *API) AccessFreshFood(apiStr string, params url.Values) error {
@@ -227,7 +227,7 @@ func (f *API) MtpsOrderStatusChanged(order *mtpsapi.CallbackOrderMsg) error {
params := make(url.Values)
params.Set(URL_FRESHFOOD_PARA_DELIVERYID, utils.Int64ToStr(order.DeliveryID))
params.Set(URL_FRESHFOOD_PARA_MTPEISONID, order.MtPeisongID)
params.Set(URL_FRESHFOOD_PARA_ORDERID, order.OrderId)
params.Set(URL_FRESHFOOD_PARA_ORDERID, order.OrderID)
params.Set(URL_FRESHFOOD_PARA_STATUS, utils.Int2Str(order.Status))
params.Set(URL_FRESHFOOD_PARA_COURIERNAME, order.CourierName)
params.Set(URL_FRESHFOOD_PARA_COURIERPHONE, order.CourierPhone)
@@ -244,7 +244,7 @@ func (f *API) MtpsOrderException(order *mtpsapi.CallbackOrderExceptionMsg) error
params := make(url.Values)
params.Set(URL_FRESHFOOD_PARA_DELIVERYID, utils.Int64ToStr(order.DeliveryID))
params.Set(URL_FRESHFOOD_PARA_MTPEISONID, order.MtPeisongID)
params.Set(URL_FRESHFOOD_PARA_ORDERID, order.OrderId)
params.Set(URL_FRESHFOOD_PARA_ORDERID, order.OrderID)
params.Set(URL_FRESHFOOD_PARA_EXCEPTIONID, utils.Int64ToStr(order.ExceptionID))
params.Set(URL_FRESHFOOD_PARA_EXCEPTIONCODE, utils.Int2Str(order.ExceptionCode))
params.Set(URL_FRESHFOOD_PARA_EXCEPTIONDESC, order.ExceptionDescr)