From 06e2a75f8c0a532b865ac0b281fec5305e44957b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 29 Jul 2020 15:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformapi/dadaapi/order_test.go |  2 +-
 platformapi/jdshopapi/callback.go | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/platformapi/dadaapi/order_test.go b/platformapi/dadaapi/order_test.go
index 7cd79f56..8c9bc2d8 100644
--- a/platformapi/dadaapi/order_test.go
+++ b/platformapi/dadaapi/order_test.go
@@ -40,7 +40,7 @@ func TestAddOrderAfterQuery(t *testing.T) {
 }
 
 func TestCancel(t *testing.T) {
-	cancelResponse, err := dadaapi.CancelOrder("129178201000000002", ReasonIDOther, "协商一致")
+	cancelResponse, err := dadaapi.CancelOrder("129188742504000002", ReasonIDOther, "协商一致")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/platformapi/jdshopapi/callback.go b/platformapi/jdshopapi/callback.go
index 5e2b75c0..366918a8 100644
--- a/platformapi/jdshopapi/callback.go
+++ b/platformapi/jdshopapi/callback.go
@@ -1,6 +1,7 @@
 package jdshopapi
 
 import (
+	"encoding/json"
 	"io/ioutil"
 	"net/http"
 
@@ -66,14 +67,8 @@ func (a *API) GetCallbackMsg(request *http.Request) (call *CallBackResult, err e
 		return nil, err
 	}
 	mapData := utils.URLValues2Map(values)
-	consigneeInfo := &CallBackConsigneeInfo{}
-	var itemInfoList []*CallBackItemInfoList
-	utils.Map2StructByJson(mapData["consigneeInfo"], &consigneeInfo, false)
-	utils.Map2StructByJson(mapData["itemInfoList"], &itemInfoList, false)
-	delete(mapData, "consigneeInfo")
-	delete(mapData, "itemInfoList")
-	utils.Map2StructByJson(mapData, &call, false)
-	call.ConsigneeInfo = consigneeInfo
-	call.ItemInfoList = itemInfoList
+	if err = json.Unmarshal([]byte(mapData["orderInfo"].(string)), &call); err != nil {
+		return nil, err
+	}
 	return call, err
 }