From 8bb1badb2c28d221f1a8d1675a30263ed78f1e8b Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 8 Aug 2018 14:20:25 +0800 Subject: [PATCH] - refactor cancel waybill reason. --- business/controller/dada/waybill.go | 2 +- business/controller/mtps/waybill.go | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/business/controller/dada/waybill.go b/business/controller/dada/waybill.go index 83b004256..abeaebb9e 100644 --- a/business/controller/dada/waybill.go +++ b/business/controller/dada/waybill.go @@ -128,7 +128,7 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) { func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) { reasonID := dadaapi.ReasonIDOther - reasonMsg := "other reason" + reasonMsg := "send not in time" if bill.Status < model.WaybillStatusAccepted { reasonID = dadaapi.ReasonIDNobodyAccept reasonMsg = "ReasonIDNobodyAccept" diff --git a/business/controller/mtps/waybill.go b/business/controller/mtps/waybill.go index f56dcf69e..099747b2e 100644 --- a/business/controller/mtps/waybill.go +++ b/business/controller/mtps/waybill.go @@ -237,15 +237,14 @@ func (c *WaybillController) CreateWaybill(order *model.GoodsOrder) (err error) { } func (c *WaybillController) CancelWaybill(bill *model.Waybill) (err error) { - reasonID := mtpsapi.CancelReasonMerchantOther - reasonMsg := "other reason" + reasonID := mtpsapi.CancelReasonRidderSendNotIntime + reasonMsg := "CancelReasonRidderSendNotIntime" if bill.Status < model.WaybillStatusAccepted { + reasonID = mtpsapi.CancelReasonMerchantOther + reasonMsg = "nobody accept order" } else if bill.Status < model.WaybillStatusCourierArrived { reasonID = mtpsapi.CancelReasonRideerGetGoodNotIntime reasonMsg = "CancelReasonRideerGetGoodNotIntime" - } else { - reasonID = mtpsapi.CancelReasonRidderSendNotIntime - reasonMsg = "CancelReasonRidderSendNotIntime" } _, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, reasonID, reasonMsg) return nil