From 4be654fc3ea91af562477548310427e800d0ffee Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 4 Sep 2019 08:43:39 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8BBaseSch?=
 =?UTF-8?q?eduler.ConfirmSelfTake=E5=9C=A8=E4=B8=8D=E8=83=BD=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=96=E5=BE=97=E8=87=AA=E6=8F=90=E8=B4=A7=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/basesch/basesch_ext.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index c4918edeb..3b1b7e2ea 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -247,7 +247,10 @@ func (c *BaseScheduler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID st
 	}
 	if selfTakeCode == "135246" {
 		if selfTakeCode, err = jd.CurPurchaseHandler.GetSelfTakeCode(ctx, vendorOrderID); err != nil {
-			return err
+			return fmt.Errorf("获取订单:%s自提货码失败，原始错误:%s", vendorOrderID, err.Error())
+		}
+		if selfTakeCode == "" {
+			return fmt.Errorf("订单:%s看起来不是一个自提订单，如果确认是自提订单，请联系开发", vendorOrderID)
 		}
 	}
 	err = jd.CurPurchaseHandler.ConfirmSelfTake(ctx, vendorOrderID, selfTakeCode)