From 0b040d1e725a3895bdf731b6936a81b1beaefd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 9 Mar 2022 16:38:51 +0800 Subject: [PATCH] cancelwaybill --- business/partner/delivery/mtps/waybill.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 14318c90d..3e42a4473 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -330,16 +330,11 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee } func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { - // 查询delivery_id - order, err := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, 0) - if err != nil { - return err - } cancelReasonID = mtpsapi.CancelReasonMerchantOther if cancelReason == "" { cancelReason = "顾客主动取消" } - _, err = api.MtpsAPI.CancelOrder(c.getDeliveryID(order), bill.VendorWaybillID, cancelReasonID, cancelReason) + _, err = api.MtpsAPI.CancelOrder(utils.Str2Int64(bill.VendorWaybillID2), bill.VendorWaybillID, cancelReasonID, cancelReason) return err }