From 6e0229805b3658c0a0191ef5085cd1898eb8e33a Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sat, 16 May 2020 13:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=BF=AB=E9=80=92=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=96=E5=BF=AB=E9=80=92=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index aaf0d6761..cd0080fbf 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -151,8 +151,10 @@ var (
 		6039390: 200,
 	}
 
-	regexpCnameAndCmobile = regexp.MustCompile(`配送员，(.*)，手机号，(.*)`)
-	bagSkuMap             = map[int]int{ //京西物料袋子skuid
+	regexpCnameAndCmobile  = regexp.MustCompile(`配送员，(.*)，手机号，(.*)`)
+	regexpCnameAndCmobile2 = regexp.MustCompile(`快递员：(.*)，联系电话：(.*)`)
+
+	bagSkuMap = map[int]int{ //京西物料袋子skuid
 		6039382: 6039382,
 		6039383: 6039383,
 		6039384: 6039384,
@@ -1477,8 +1479,16 @@ func updateJdWayBillInfo(db *dao.DaoDB, order *model.GoodsOrder, getTrackMessage
 	for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
 		if vv.OpeTitle == "配送员收货" {
 			result := regexpCnameAndCmobile.FindAllStringSubmatch(vv.OpeRemark, -1)
-			cName = result[0][1]
-			cMobile = result[0][2]
+			if len(result) > 0 {
+				cName = result[0][1]
+				cMobile = result[0][2]
+			} else {
+				result2 := regexpCnameAndCmobile2.FindAllStringSubmatch(vv.OpeRemark, -1)
+				if len(result2) > 0 {
+					cName = result[0][1]
+					cMobile = result[0][2]
+				}
+			}
 			break
 		}
 	}