From dd49babf2965351e26d7e0187051b25e06277cef Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 24 Jul 2018 09:23:50 +0800
Subject: [PATCH] - fixed bug of jd api:OrderJDZBDelivery and DeliveryEndOrder.

---
 platformapi/dadaapi/dadaapi_test.go     |  2 --
 platformapi/elmapi/elmapi_test.go       | 31 +++++++++++++++--
 platformapi/jdapi/jdapi_test.go         | 46 +++++++++++++++++++++++--
 platformapi/jdapi/order.go              |  4 +--
 platformapi/mtpsapi/mtpsapi_test.go     |  3 ++
 platformapi/weixinapi/weixinapi_test.go |  2 ++
 6 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/platformapi/dadaapi/dadaapi_test.go b/platformapi/dadaapi/dadaapi_test.go
index 73e4ee8e..a164c496 100644
--- a/platformapi/dadaapi/dadaapi_test.go
+++ b/platformapi/dadaapi/dadaapi_test.go
@@ -26,9 +26,7 @@ func init() {
 
 	// sandbox
 	dadaapi = New("dada9623324449cd250", "30c2abbfe8a8780ad5aace46300c64b9", "73753", "http://callback.jxc4.com/dada/order", false)
-
 	// prod
-
 	testOrder = &OperateOrderRequiredParams{
 		ShopNo:          testShopNo,
 		OriginID:        "234242342",
diff --git a/platformapi/elmapi/elmapi_test.go b/platformapi/elmapi/elmapi_test.go
index 9b7b733d..90ad0420 100644
--- a/platformapi/elmapi/elmapi_test.go
+++ b/platformapi/elmapi/elmapi_test.go
@@ -21,9 +21,8 @@ func init() {
 
 	// sandbox
 	elmapi = New("623c0904c0d2499e83df15b62902eb65", "RwT214gAsS", "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db", false)
-
 	// prod
-	// elmapi = New("a530ade4a8e0b99542df0592b06575b5", "KLRDcOZGrk", "1fc221f8265506531da36fb613d5f5ad673f2e9a", true)
+	// elmapi = New("d2cbacee0359c1932e3e3827950cbbb1", "KLRDcOZGrk", "1fc221f8265506531da36fb613d5f5ad673f2e9a", true)
 }
 
 func TestTest(t *testing.T) {
@@ -129,3 +128,31 @@ func TestConfirmOrder(t *testing.T) {
 		t.Fatalf("Error when accessing ConfirmOrdererror:%v", err)
 	}
 }
+
+func TestCancelOrder(t *testing.T) {
+	err := elmapi.CancelOrder("3023582487561731159", CancelOrderTypeOthers, "")
+	if err != nil {
+		t.Fatalf("Error when accessing ConfirmOrdererror:%v", err)
+	}
+}
+
+func TestDeliveryBySelfLite(t *testing.T) {
+	err := elmapi.DeliveryBySelfLite("3023582487561731159")
+	if err != nil {
+		t.Fatalf("Error when accessing ConfirmOrdererror:%v", err)
+	}
+}
+
+func TestStartDeliveryBySelf(t *testing.T) {
+	err := elmapi.StartDeliveryBySelf("3023582487561731159", "13812345678")
+	if err != nil {
+		t.Fatalf("Error when accessing ConfirmOrdererror:%v", err)
+	}
+}
+
+func TestCompleteDeliveryBySelf(t *testing.T) {
+	err := elmapi.CompleteDeliveryBySelf("3023582487561731159", "13812345678")
+	if err != nil {
+		t.Fatalf("Error when accessing ConfirmOrdererror:%v", err)
+	}
+}
diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go
index f0310842..06a4266c 100644
--- a/platformapi/jdapi/jdapi_test.go
+++ b/platformapi/jdapi/jdapi_test.go
@@ -21,8 +21,11 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	sugarLogger = logger.Sugar()
 	baseapi.Init(sugarLogger)
-	// jdapi = New("91633f2a-c5f5-4982-a925-a220d19095c3", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4") // prod
-	jdapi = New("c8854ef2-f80a-45ee-aceb-dc8014d646f8", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84") //test
+
+	// sandbox
+	jdapi = New("c8854ef2-f80a-45ee-aceb-dc8014d646f8", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84")
+	// prod
+	// jdapi = New("91633f2a-c5f5-4982-a925-a220d19095c3", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4")
 }
 
 func TestTest(t *testing.T) {
@@ -228,3 +231,42 @@ func TestCallbackMsgPlayback(t *testing.T) {
 		}
 	}
 }
+func TestOrderAcceptOperate(t *testing.T) {
+	result, err := jdapi.OrderAcceptOperate("813344594000041", true)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	sugarLogger.Debug(result)
+}
+
+func TestOrderJDZBDelivery(t *testing.T) {
+	result, err := jdapi.OrderJDZBDelivery("813344594000041")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	sugarLogger.Debug(result)
+}
+
+func TestModifySellerDelivery(t *testing.T) {
+	result, err := jdapi.ModifySellerDelivery("813344594000041")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	sugarLogger.Debug(result)
+}
+
+func TestOrderSerllerDelivery(t *testing.T) {
+	result, err := jdapi.OrderSerllerDelivery("813344594000041")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	sugarLogger.Debug(result)
+}
+
+func TestDeliveryEndOrder(t *testing.T) {
+	result, err := jdapi.DeliveryEndOrder("813344594000041")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	sugarLogger.Debug(result)
+}
diff --git a/platformapi/jdapi/order.go b/platformapi/jdapi/order.go
index c8a69131..bf2c08c2 100644
--- a/platformapi/jdapi/order.go
+++ b/platformapi/jdapi/order.go
@@ -105,7 +105,7 @@ func (a API) OrderJDZBDelivery(orderId string) (interface{}, error) {
 		"orderId":  orderId,
 		"operator": utils.GetAPIOperator(),
 	}
-	return a.AccessAPINoPage("/bm/open/api/order/OrderJDZBDelivery", jdParams, nil, nil)
+	return a.AccessAPINoPage("bm/open/api/order/OrderJDZBDelivery", jdParams, nil, nil)
 }
 
 // 订单达达配送转商家自送接口
@@ -133,7 +133,7 @@ func (a API) OrderSerllerDelivery(orderId string) (interface{}, error) {
 func (a API) DeliveryEndOrder(orderId string) (interface{}, error) {
 	jdParams := map[string]interface{}{
 		"orderId":  orderId,
-		"operator": utils.GetAPIOperator(),
+		"operPin":  utils.GetAPIOperator(),
 		"operTime": utils.GetCurTimeStr(),
 	}
 	return a.AccessAPINoPage("ocs/deliveryEndOrder", jdParams, nil, nil)
diff --git a/platformapi/mtpsapi/mtpsapi_test.go b/platformapi/mtpsapi/mtpsapi_test.go
index e006aa46..786a778e 100644
--- a/platformapi/mtpsapi/mtpsapi_test.go
+++ b/platformapi/mtpsapi/mtpsapi_test.go
@@ -18,7 +18,10 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	sugarLogger = logger.Sugar()
 	baseapi.Init(sugarLogger)
+
+	// sandbox
 	mtpsapi = New("25e816550bc9484480642f19a95f13fd", "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^")
+	// prod
 	// mtpsapi = New("3c0a05d464c247c19d7ec13accc78605", "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE")
 }
 
diff --git a/platformapi/weixinapi/weixinapi_test.go b/platformapi/weixinapi/weixinapi_test.go
index 847b1bca..1ff2efcf 100644
--- a/platformapi/weixinapi/weixinapi_test.go
+++ b/platformapi/weixinapi/weixinapi_test.go
@@ -18,6 +18,8 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	sugarLogger = logger.Sugar()
 	baseapi.Init(sugarLogger)
+
+	// sandbox
 	weixinapi = New("wxbf235770edaabc5c", "ba32b269a068a5b72486a0beafd171e8")
 }