From a464da447650bebac44969352d523fa80b704698 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 5 Sep 2019 18:22:28 +0800
Subject: [PATCH] + GetByOrderNoForOaosNew

---
 platformapi/jdapi/order.go      | 13 +++++++++++++
 platformapi/jdapi/order_test.go | 12 ++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/platformapi/jdapi/order.go b/platformapi/jdapi/order.go
index 8a75d2a7..f1b62f5b 100644
--- a/platformapi/jdapi/order.go
+++ b/platformapi/jdapi/order.go
@@ -707,6 +707,19 @@ func (a *API) GetByOrderNoForOaos(orderNo string) (orderTrackList []*OrderTrack,
 	return orderTrackList, err
 }
 
+// 新版根据订单号查询订单跟踪接口
+// https://openo2o.jddj.com/staticnew/widgets/resources.html?groupid=169&apiid=6450cd91dd5b4dc0bb6a6cd17af6d0a4
+func (a *API) GetByOrderNoForOaosNew(orderID string) (orderTrackList []*OrderTrack, err error) {
+	jdParams := map[string]interface{}{
+		"orderId": orderID,
+	}
+	result, err := a.AccessAPINoPage("orderTrace/getByOrderNoForOaosNew", jdParams, nil, nil, genNoPageResultParser("code", "detail", "result", "0"))
+	if err == nil {
+		err = utils.Map2StructByJson(result.(map[string]interface{})["orderTrackList"], &orderTrackList, false)
+	}
+	return orderTrackList, err
+}
+
 // 订单自提码核验接口
 // https://openo2o.jddj.com/staticnew/widgets/resources.html?groupid=169&apiid=428fa2cb66784b64a85db36ec2972ff9
 func (a *API) CheckSelfPickCode(selfPickCode, orderID, operPin string) (err error) {
diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go
index 2513f0ee..b95119c4 100644
--- a/platformapi/jdapi/order_test.go
+++ b/platformapi/jdapi/order_test.go
@@ -238,7 +238,15 @@ func TestOrderQuery2(t *testing.T) {
 }
 
 func TestGetByOrderNoForOaos(t *testing.T) {
-	orderList, err := api.GetByOrderNoForOaos("921160248000222")
+	orderList, err := api.GetByOrderNoForOaos("921235438000341")
+	t.Log(utils.Format4Output(orderList, false))
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+}
+
+func TestGetByOrderNoForOaosNew(t *testing.T) {
+	orderList, err := api.GetByOrderNoForOaosNew("921235438000341")
 	t.Log(utils.Format4Output(orderList, false))
 	if err != nil {
 		t.Fatal(err.Error())
@@ -246,7 +254,7 @@ func TestGetByOrderNoForOaos(t *testing.T) {
 }
 
 func TestCheckSelfPickCode(t *testing.T) {
-	err := api.CheckSelfPickCode("", "921241806000842", "test")
+	err := api.CheckSelfPickCode("020606", "921235438000341", "test")
 	if err != nil {
 		t.Fatal(err.Error())
 	}