diff --git a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php index f154b675..b23ae1e7 100644 --- a/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php +++ b/app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php @@ -138,27 +138,13 @@ class FetchOrderListsFromYdPortalProcessor try { $start = $start ? $start : Carbon::now()->subMonths(4); - $startLimit = Carbon::parse('01-12-2021'); + $startLimit = Carbon::parse('23-02-2022'); if($start->isBefore($startLimit)){ $start = $startLimit; } - $end = $end ? $end : Carbon::now(); - - $trackingRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/ApiTracking.ashx', 'GET', [ - 'trakingno' => 'M202202230904163' - ]); - - $rows = $this->fetchesDataFRomYDPortal->getResponseBody($trackingRequest); - - foreach (array_reverse($rows->data) as $trackingRow) { - if (Str::contains($trackingRow->tracking, ['派送中', '派送完成'])) { - $deliveryDate = Carbon::parse($trackingRow->trackingtime); - } - } - - dd($deliveryDate); + $end = $end ? $end : Carbon::parse('24-02-2022'); $orderRequest = $this->fetchesDataFRomYDPortal->clientRequest('http://www.yd-wl.com/api/GetOrderList.ashx', 'GET', [ 'begintime' => $start->timestamp, @@ -166,7 +152,7 @@ class FetchOrderListsFromYdPortalProcessor ]); $rows = $this->fetchesDataFRomYDPortal->getResponseBody($orderRequest); - +dd($rows->data); foreach($rows->data as $row){ $containerReference = null; @@ -237,7 +223,7 @@ class FetchOrderListsFromYdPortalProcessor $unstuffingDate = Carbon::parse($trackingRow->trackingtime); } - if (Str::contains('', ['派送中'])) { + if (Str::contains($trackingRow->tracking, ['派送中'])) { $deliveryDate = Carbon::parse($trackingRow->trackingtime); } }