liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jxstore

Browse Source
This commit is contained in:
gazebo
2018-09-05 14:21:52 +08:00
parent 9e8ed7d600 1ed1838802
commit e734fdb425
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
business/partner/delivery/mtps/waybill.go
View File

@@ -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) { func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
switch cancelReasonID { // switch cancelReasonID {
case partner.CancelWaybillReasonNotAcceptIntime: // case partner.CancelWaybillReasonNotAcceptIntime:
cancelReasonID = mtpsapi.CancelReasonRideerMtpsOther // cancelReasonID = mtpsapi.CancelReasonRideerMtpsOther
case partner.CancelWaybillReasonSwitch2SelfFailed: // case partner.CancelWaybillReasonSwitch2SelfFailed:
cancelReasonID = mtpsapi.CancelReasonMerchantOther // cancelReasonID = mtpsapi.CancelReasonMerchantOther
default: // default:
cancelReasonID = mtpsapi.CancelReasonRideerOther // cancelReasonID = mtpsapi.CancelReasonRideerOther
} // }
cancelReasonID = mtpsapi.CancelReasonMerchantOther
_, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason) _, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason)
return nil return nil
} }