From cccd0273657b562e9a04c80cc5289eaee3ba5175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 12 Jun 2020 17:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E9=A2=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E6=9C=9F=E6=9C=9B=E9=80=81?=
 =?UTF-8?q?=E8=BE=BE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformapi/jdshopapi/store_page.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/platformapi/jdshopapi/store_page.go b/platformapi/jdshopapi/store_page.go
index 30375785..ecebde85 100644
--- a/platformapi/jdshopapi/store_page.go
+++ b/platformapi/jdshopapi/store_page.go
@@ -17,6 +17,7 @@ var (
 	regexpOrderDetailTd        = regexp.MustCompile(`<td colspan="2">(.*?)</td>`)
 	regexpOrderDetailMobile    = regexp.MustCompile(`<span id="mobile">(.*?)</span>`)
 	regexpOrderDetailDay       = regexp.MustCompile(`<td class="pubwhite">期望送货日期:</td>[\s\S]*?<td colspan="2">(.*?)</td>`)
+	regexpOrderDetailDay2      = regexp.MustCompile(`<td class="pubwhite">配送日期:</td>[\s\S]*?<td colspan="2">(.*?)</td>`)
 	regexpOrderDetailPay       = regexp.MustCompile(`<td class="pubwhite">应支付金额:</td>[\s\S]*?<td>[\s\S]*?￥(.*?[\s\S]*?)</td>`)
 	regexpOrderDetailMobileKey = regexp.MustCompile(`accesskey="(.*?)"`)
 )
@@ -420,9 +421,14 @@ func (a *API) OrderDetail(orderId string) (orderDetailResult *OrderDetailResult,
 			}
 		}
 		if len(expectedDeliveredTime) > 0 {
-			// times := strings.Split(expectedDeliveredTime[1], ",")
-			// orderDetailResult.ExpectedDeliveredTime = times[0] + " " + times[1][:strings.Index(times[1], ":")] + ":00:00"
 			orderDetailResult.ExpectedDeliveredTime = expectedDeliveredTime[1][:strings.LastIndex(expectedDeliveredTime[1], "-")] + ":00"
+			if orderDetailResult.ExpectedDeliveredTime == "" {
+				expectedDeliveredTime2 := regexpOrderDetailDay2.FindStringSubmatch(body)
+				if len(expectedDeliveredTime2) > 0 {
+					times := strings.Split(expectedDeliveredTime2[1], ",")
+					orderDetailResult.ExpectedDeliveredTime = times[0] + " " + times[1][:strings.Index(times[1], ":")] + ":00:00"
+				}
+			}
 		}
 		if len(actualPayPrice) > 0 {
 			orderDetailResult.ActualPayPrice = utils.Float64TwoInt64(utils.Str2Float64(strings.TrimSpace(actualPayPrice[1])) * 100)