Merge branch 'master' of e.coding.net:rosydev/baseapi

platformapi/uuptapi/callback.go

@@ -1,9 +1,10 @@
 package uuptapi
 
 import (
-	"fmt"
+	"encoding/json"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
+	"io/ioutil"
 	"net/http"
 )
 
@@ -36,19 +37,40 @@ func Err2CallbackResponse(err error) *CallbackResponse {
 
 //订单提交后状态变化回调
 func (a *API) WaybillCallback(request *http.Request) (*WaybillCallbackParam, *CallbackResponse) {
-	if callbackResponse := a.CheckCallbackValidation(request); callbackResponse != nil {
-		return nil, callbackResponse
+	//if callbackResponse := a.CheckCallbackValidation(request); callbackResponse != nil {
+	//	return nil, callbackResponse
+	//}
+
+	buf, err := ioutil.ReadAll(request.Body)
+	if err != nil {
+		globals.SugarLogger.Debugf("========buf err %v", err)
+		return nil, &CallbackResponse{
+			ReturnCode: "2065",
+			ReturnMsg:  "错误",
+		}
 	}
-	retVal := WaybillCallbackParam{}
-	if err := utils.Map2StructByJson(utils.URLValues2Map(request.PostForm), &retVal, true); err != nil {
-		return nil, Err2CallbackResponse(err)
-	}
-	con := retVal != WaybillCallbackParam{}
-	if con {
-		return &retVal, Err2CallbackResponse(nil)
-	} else {
-		return nil, Err2CallbackResponse(fmt.Errorf("UU跑腿运单回调信息为空"))
+	retVal := &WaybillCallbackParam{}
+	if err := json.Unmarshal(buf, retVal); err != nil {
+		globals.SugarLogger.Debugf("========buf err %v", err)
+		return nil, &CallbackResponse{
+			ReturnCode: "20625",
+			ReturnMsg:  "错误2",
+		}
 	}
+	globals.SugarLogger.Debugf("====retVal := %s", utils.Format4Output(retVal, false))
+
+	//retVal := WaybillCallbackParam{}
+	//if err := utils.Map2StructByJson(utils.URLValues2Map(request.PostForm), &retVal, true); err != nil {
+	//	return nil, Err2CallbackResponse(err)
+	//}
+	globals.SugarLogger.Debugf("retval======%s", utils.Format4Output(retVal, false))
+	//con := retVal != WaybillCallbackParam{}
+	//if con {
+	//	return &retVal, Err2CallbackResponse(nil)
+	//} else {
+	//	return nil, Err2CallbackResponse(fmt.Errorf("UU跑腿运单回调信息为空"))
+	//}
+	return retVal, Err2CallbackResponse(nil)
 }
 
 func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse *CallbackResponse) {

platformapi/uuptapi/uupt_model.go

@@ -223,5 +223,6 @@ type WaybillCallbackParam struct {
 	AppID        string `json:"appid"`         //第三方用户唯一凭证
 	ReturnMsg    string `json:"return_msg"`    //返回信息，如非空，为错误原因，如签名失败、参数格式校验错误
 	ReturnCode   string `json:"return_code"`   //状态，ok/fail表示成功
+	Timestamp    string `json:"timestamp"`
 	//BaseRespInfo
 }