diff --git a/platformapi/jdshopapi/store_page.go b/platformapi/jdshopapi/store_page.go index d39cda8f..bddebfd1 100644 --- a/platformapi/jdshopapi/store_page.go +++ b/platformapi/jdshopapi/store_page.go @@ -16,7 +16,7 @@ var ( regexpOrderDetailTable = regexp.MustCompile(`([\s\S]*?)
`) regexpOrderDetailTd = regexp.MustCompile(`(.*?)`) regexpOrderDetailMobile = regexp.MustCompile(`(.*?)`) - regexpOrderDetailDay = regexp.MustCompile(`配送日期:[\s\S]*?(.*?)`) + regexpOrderDetailDay = regexp.MustCompile(`期望送货日期:[\s\S]*?(.*?)`) regexpOrderDetailPay = regexp.MustCompile(`应支付金额:[\s\S]*?[\s\S]*?¥(.*?[\s\S]*?)`) regexpOrderDetailMobileKey = regexp.MustCompile(`accesskey="(.*?)"`) ) @@ -420,8 +420,9 @@ 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" + // 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 len(actualPayPrice) > 0 { orderDetailResult.ActualPayPrice = utils.Float64TwoInt64(utils.Str2Float64(strings.TrimSpace(actualPayPrice[1])) * 100) diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go index ba7a3c6b..6cce12c4 100644 --- a/platformapi/jdshopapi/store_page_test.go +++ b/platformapi/jdshopapi/store_page_test.go @@ -4,6 +4,7 @@ import ( "fmt" "io/ioutil" "net/http" + "strings" "testing" "git.rosy.net.cn/baseapi/utils" @@ -89,3 +90,8 @@ func TestUpdateWaybill(t *testing.T) { } // t.Log(utils.Format4Output(result, false)) } + +func TestAAAAAA(t *testing.T) { + str := "2020-06-02 16:00-17:00" + fmt.Println(str[:strings.LastIndex(str, "-")]) +}