From 72d6b3c733facac3845be5724da9689a6198cdc6 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 25 Nov 2019 18:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=85=8D=E9=80=81=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E4=B8=89=E6=96=B9=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E9=99=90=E4=BB=B7=E7=9B=B4=E6=8E=A5=E4=B8=BA10=E5=85=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 5d0a0712c..0da8d7bca 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1125,6 +1125,10 @@ func getMaxDeliveryFee(order *model.GoodsOrder) (maxDeliveryFee int64) {
 	} else {
 		maxDeliveryFee = baseWaybillFee + order.DistanceFreightMoney + getWaybillTip(order)
 	}
+	if maxDeliveryFee < ebaiCancelWaybillMaxFee &&
+		order.DeliveryType == model.OrderDeliveryTypeStoreSelf {
+		maxDeliveryFee = ebaiCancelWaybillMaxFee
+	}
 	return maxDeliveryFee
 }