From 47ca162a7bd112fc9fca880503ff4dcb5ba9c2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 4 Dec 2023 18:01:49 +0800
Subject: [PATCH] 1

---
 platformapi/jdapi/callback.go | 61 -----------------------------------
 1 file changed, 61 deletions(-)

diff --git a/platformapi/jdapi/callback.go b/platformapi/jdapi/callback.go
index e44561a7..688a566a 100644
--- a/platformapi/jdapi/callback.go
+++ b/platformapi/jdapi/callback.go
@@ -1,7 +1,6 @@
 package jdapi
 
 import (
-	"encoding/json"
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/jx-callback/globals"
 	"io/ioutil"
@@ -258,66 +257,6 @@ func getMsgURLFromRequest(request *http.Request) (msgURL string) {
 	return msgURL
 }
 
-func GetCallbackMsg2(request *http.Request) (callbackMsg *CallbackMsg, mapData map[string]interface{}, callbackResponse *CallbackResponse) {
-	msgURL := getMsgURLFromRequest(request)
-	data, err := ioutil.ReadAll(request.Body)
-	if err != nil {
-		return nil, nil, Err2CallbackResponse(err, "")
-	}
-	globals.SugarLogger.Debugf("==============data := %s", utils.Format4Output(data, false))
-	globals.SugarLogger.Debugf("==============msgURL := %s", msgURL)
-	//values, err := utils.HTTPBody2Values(data, needDecodeMap[msgURL])
-	//if err != nil {
-	//	return nil, nil, FormatErrorResponse
-	//}
-	//for k, v := range values {
-	//	mapData[k] = v
-	//}
-	if err = json.Unmarshal(data, &callbackMsg); err != nil {
-		return nil, nil, Err2CallbackResponse(err, "")
-	}
-
-	if /*err = utils.Map2StructByJson(mapData, &callbackMsg, false);*/ err == nil {
-		callbackMsg.MsgURL = msgURL
-		if msgURL == CallbackMsgPushDeliveryStatus {
-			var deliveryMsg *CallbackDeliveryStatusMsg
-			if err = utils.UnmarshalUseNumber([]byte(callbackMsg.JdParamJSON), &deliveryMsg); err == nil {
-				callbackMsg.Param = deliveryMsg
-				deliveryMsg.CallbackMsg = callbackMsg
-			}
-		} else if msgURL == CallbackMsgStockIsHave {
-			var mapData map[string]interface{}
-			if err = utils.UnmarshalUseNumber([]byte(callbackMsg.JdParamJSON), &mapData); err == nil {
-				stockMsg := map2StockCallbackMsg(mapData)
-				callbackMsg.Param = stockMsg
-				stockMsg.CallbackMsg = callbackMsg
-			}
-		} else if msgURL == CallbackMsgOrderInfoChange {
-			var orderInfoMsg *CallbackOrderInfoChangeMsg
-			if err = utils.UnmarshalUseNumber([]byte(callbackMsg.JdParamJSON), &orderInfoMsg); err == nil {
-				callbackMsg.Param = orderInfoMsg
-				orderInfoMsg.CallbackMsg = callbackMsg
-			}
-		} else if msgURL == CallBackMsgMemberCreateCard || msgURL == CallBackMsgMemberRenewCard {
-			var orderInfoMsg *CallbackMemberMsg
-			if err = utils.UnmarshalUseNumber([]byte(callbackMsg.JdParamJSON), &orderInfoMsg); err == nil {
-				callbackMsg.Param = orderInfoMsg
-				orderInfoMsg.CallbackMsg = callbackMsg
-			}
-		} else {
-			var orderMsg *CallbackOrderMsg
-			if err = utils.UnmarshalUseNumber([]byte(callbackMsg.JdParamJSON), &orderMsg); err == nil {
-				callbackMsg.Param = orderMsg
-				orderMsg.CallbackMsg = callbackMsg
-			}
-		}
-	}
-	if err != nil {
-		return nil, nil, Err2CallbackResponse(err, "")
-	}
-	return callbackMsg, mapData, callbackResponse
-}
-
 func GetCallbackMsg(request *http.Request) (callbackMsg *CallbackMsg, mapData map[string]interface{}, callbackResponse *CallbackResponse) {
 	msgURL := getMsgURLFromRequest(request)
 	data, err := ioutil.ReadAll(request.Body)