From a38a0e8d849636b8118c20c79a69ffc369a68efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 14 Sep 2020 18:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=8512=E5=B0=8F=E6=97=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=94=AE=E5=90=8E=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go     | 1 -
 business/partner/purchase/jdshop/order.go | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index c75de1042..e3d5a191b 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1818,7 +1818,6 @@ func RefreshJdsOrderConsigneeInfo(ctx *jxcontext.Context, vendorOrderID string)
 	if jdsOrder == nil {
 		return fmt.Errorf("未查询到对应的京东商城订单！")
 	}
-	fmt.Println("test1", utils.Format4Output(jdsOrder, false))
 	order.ConsigneeAddress = jdshop.Decrypt(jdsOrder.ConsigneeInfo.FullAddress)
 	order.ConsigneeName = jdshop.Decrypt(jdsOrder.ConsigneeInfo.Fullname)
 	order.ConsigneeMobile = jdshop.Decrypt(jdsOrder.ConsigneeInfo.Mobile)
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index b97781162..68e18e661 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -237,7 +237,7 @@ func GetJdsOrder(vendorOrderID string) (jdsOrder *jdshopapi.GetOrderResult, err
 	params["orderID"] = vendorOrderID
 	params["token"] = jdshopapi.JdsYdToken
 	result, err := apiToYd("order/GetJdsOrder", params)
-	jdsOrder = &jdshopapi.GetOrderResult{}
-	json.Unmarshal([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder)
-	return jdsOrder, err
+	jdsOrder2 := &jdshopapi.GetOrderResult{}
+	json.Unmarshal([]byte(strings.ReplaceAll(result["data"].(string), "\\", "")), &jdsOrder2)
+	return jdsOrder2, err
 }