From 57a9d70c74a34835e25119bc339f54681646961d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 22 Dec 2020 11:16:43 +0800
Subject: [PATCH] aa

---
 business/partner/delivery/fn/waybill.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go
index 3487401ad..4af6c9568 100644
--- a/business/partner/delivery/fn/waybill.go
+++ b/business/partner/delivery/fn/waybill.go
@@ -1,6 +1,7 @@
 package fn
 
 import (
+	"strings"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -45,6 +46,9 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 		OrderCancelCode:       fnpsapi.OrderCancelReson8,
 		OrderCancelTime:       time.Now().UnixNano() / 1e6,
 	})
+	if strings.Contains(err.Error(), "运单暂未生成") {
+		err = nil
+	}
 	return err
 }