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(`
(.*?) | `)
regexpOrderDetailMobile = regexp.MustCompile(`(.*?)`)
regexpOrderDetailDay = regexp.MustCompile(`期望送货日期: | [\s\S]*?(.*?) | `)
+ regexpOrderDetailDay2 = regexp.MustCompile(`配送日期: | [\s\S]*?(.*?) | `)
regexpOrderDetailPay = regexp.MustCompile(`应支付金额: | [\s\S]*?[\s\S]*?¥(.*?[\s\S]*?) | `)
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)