fnps

platformapi/fnpsapi/callback.go

@@ -1,9 +1,10 @@
 package fnpsapi
 
 import (
-	"net/http"
 	"net/url"
 
+	"git.rosy.net.cn/jx-callback/globals"
+
 	"git.rosy.net.cn/baseapi/utils"
 )
 
@@ -28,15 +29,26 @@ type WayBillInfo struct {
 	DetailDescription  string `json:"detail_description"`
 }
 
-func (a *API) GetOrderCallbackMsg(request *http.Request) (orderMsg *WayBillInfo) {
-	err := request.ParseForm()
+func (a *API) GetOrderCallbackMsg(data []byte) (orderMsg *WayBillInfo) {
+	callbackInfo := &CallBackInfo{}
+	err := utils.UnmarshalUseNumber(data, callbackInfo)
+	if err != nil {
+		globals.SugarLogger.Debugf("fn msg faild %v, err : %v", string(data), err)
+		return nil
+	}
 	if err == nil {
-		params := make(url.Values)
-		for k := range request.PostForm {
-			decodedValue, _ := url.QueryUnescape(request.PostFormValue(k))
-			params.Set(k, decodedValue)
+		if str, err := url.QueryUnescape(callbackInfo.Data); err == nil {
+			orderMsg = &WayBillInfo{}
+			if err := utils.UnmarshalUseNumber([]byte(str), orderMsg); err == nil {
+				return orderMsg
+			} else {
+				globals.SugarLogger.Debugf("fn msg faild3 %v", err)
+				return nil
+			}
+		} else {
+			globals.SugarLogger.Debugf("fn msg faild2 %v", err)
+			return nil
 		}
-		utils.Map2StructByJson(params.Get("data"), &orderMsg, false)
 	}
 	return orderMsg
 }