From 1ed183880293b03dad7e3ba01f76af249219dc0c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 5 Sep 2018 12:22:04 +0800
Subject: [PATCH] - mtps Cancel reason all to merchant others.

---
 business/partner/delivery/mtps/waybill.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index f313d1806..bd9495861 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -246,14 +246,15 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy func(del
 }
 
 func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
-	switch cancelReasonID {
-	case partner.CancelWaybillReasonNotAcceptIntime:
-		cancelReasonID = mtpsapi.CancelReasonRideerMtpsOther
-	case partner.CancelWaybillReasonSwitch2SelfFailed:
-		cancelReasonID = mtpsapi.CancelReasonMerchantOther
-	default:
-		cancelReasonID = mtpsapi.CancelReasonRideerOther
-	}
+	// switch cancelReasonID {
+	// case partner.CancelWaybillReasonNotAcceptIntime:
+	// 	cancelReasonID = mtpsapi.CancelReasonRideerMtpsOther
+	// case partner.CancelWaybillReasonSwitch2SelfFailed:
+	// 	cancelReasonID = mtpsapi.CancelReasonMerchantOther
+	// default:
+	// 	cancelReasonID = mtpsapi.CancelReasonRideerOther
+	// }
+	cancelReasonID = mtpsapi.CancelReasonMerchantOther
 	_, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason)
 	return nil
 }