1
This commit is contained in:
@@ -2,7 +2,6 @@ package uuptapi
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
"git.rosy.net.cn/jx-callback/globals"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
@@ -50,8 +49,8 @@ func (a *API) WaybillCallback(request *http.Request) (*WaybillCallbackParam, *Ca
|
|||||||
ReturnMsg: "错误",
|
ReturnMsg: "错误",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
retVal := WaybillCallbackParam{}
|
retVal := &WaybillCallbackParam{}
|
||||||
if err := json.Unmarshal(buf, &retVal); err != nil {
|
if err := json.Unmarshal(buf, retVal); err != nil {
|
||||||
globals.SugarLogger.Debugf("========buf err %v", err)
|
globals.SugarLogger.Debugf("========buf err %v", err)
|
||||||
return nil, &CallbackResponse{
|
return nil, &CallbackResponse{
|
||||||
ReturnCode: "20625",
|
ReturnCode: "20625",
|
||||||
@@ -65,13 +64,13 @@ func (a *API) WaybillCallback(request *http.Request) (*WaybillCallbackParam, *Ca
|
|||||||
// return nil, Err2CallbackResponse(err)
|
// return nil, Err2CallbackResponse(err)
|
||||||
//}
|
//}
|
||||||
globals.SugarLogger.Debugf("retval======%s", utils.Format4Output(retVal, false))
|
globals.SugarLogger.Debugf("retval======%s", utils.Format4Output(retVal, false))
|
||||||
con := retVal != WaybillCallbackParam{}
|
//con := retVal != WaybillCallbackParam{}
|
||||||
if con {
|
//if con {
|
||||||
return &retVal, Err2CallbackResponse(nil)
|
// return &retVal, Err2CallbackResponse(nil)
|
||||||
} else {
|
//} else {
|
||||||
return nil, Err2CallbackResponse(fmt.Errorf("UU跑腿运单回调信息为空"))
|
// return nil, Err2CallbackResponse(fmt.Errorf("UU跑腿运单回调信息为空"))
|
||||||
}
|
//}
|
||||||
//return retVal, Err2CallbackResponse(nil)
|
return retVal, Err2CallbackResponse(nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse *CallbackResponse) {
|
func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse *CallbackResponse) {
|
||||||
|
|||||||
Reference in New Issue
Block a user