cancelwaybill

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
 }