From a4aa9366e39a5f701d3fd9feabcb182a4855a791 Mon Sep 17 00:00:00 2001 From: fomichev Date: Thu, 17 Jul 2025 10:02:04 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=BA=D0=B8?= =?utf8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B7?= =?utf8?q?=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=20=D0=BA=20=D1=81=D1=82=D0=B0?= =?utf8?q?=D1=82=D1=83=D1=81=D1=83=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?= =?utf8?q?=D1=82=D0=BA=D0=B8=201=D0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 18 +++++++++--------- erp24/api2/controllers/OrdersController.php | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index a63624f8..29c7850a 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -2906,10 +2906,10 @@ class DataController extends BaseController } // Получаем статусы МП по статусу 1С - $orderStatus1CToCodes = MarketplaceOrders::getStatusCodes($statusId1C->status_id); - - $statusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[0], $statuses, $statusCodes); - $substatusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[1], $statuses, $statusCodes); + /** @var $status MarketplaceOrderStatusTypes */ + /** @var $substatus MarketplaceOrderStatusTypes */ + $status = $statusId1C->orderStatus; + $substatus = $statusId1C->orderStatus; if ( in_array($statusId1C->status_id, ['1013', '1010']) && @@ -2919,15 +2919,15 @@ class DataController extends BaseController $updateResult = MarketplaceService::updateOrderStatus( $marketplaceOrder->warehouse_guid, $marketplaceOrder->marketplace_order_id, - $orderStatus1CToCodes[0], - $orderStatus1CToCodes[1] + $status->code, + $substatus->code ); } } else { if (!empty($orderStatus1CToCodes)) { - $marketplaceOrder->status_id = $statusId; - $marketplaceOrder->substatus_id = $substatusId; + $marketplaceOrder->status_id = $status->id; + $marketplaceOrder->substatus_id = $substatus->id; } } $marketplaceOrder->status_processing_1c = $statusId1C->id; @@ -2935,7 +2935,7 @@ class DataController extends BaseController $marketplaceOrder->number_1c = $mpOrder['number'] ?? null; if ($marketplaceOrder->save()) { // Обновляем историю статусов - MarketplaceService::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, [ + MarketplaceService::createOrUpdateStatusHistory($marketplaceOrder->id, $status->id, $substatus->id, [ 'date' => date('Y-m-d H:i:s') ]); $result = true; diff --git a/erp24/api2/controllers/OrdersController.php b/erp24/api2/controllers/OrdersController.php index 597102fd..88e270e9 100644 --- a/erp24/api2/controllers/OrdersController.php +++ b/erp24/api2/controllers/OrdersController.php @@ -114,10 +114,10 @@ class OrdersController extends BaseController } // Получаем статусы МП по статусу 1С - $orderStatus1CToCodes = MarketplaceOrders::getStatusCodes($statusId1C->status_id); - - $statusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[0], $statuses, $statusCodes); - $substatusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[1], $statuses, $statusCodes); + /** @var $status MarketplaceOrderStatusTypes */ + /** @var $substatus MarketplaceOrderStatusTypes */ + $status = $statusId1C->orderStatus; + $substatus = $statusId1C->orderStatus; if ( in_array($statusId1C->status_id, ['1013', '1010']) && @@ -127,8 +127,8 @@ class OrdersController extends BaseController $updateResult = MarketplaceService::updateOrderStatus( $order->warehouse_guid, $order->marketplace_order_id, - $orderStatus1CToCodes[0], - $orderStatus1CToCodes[1] + $status->code, + $substatus->code ); } else { $updateResult = $data['status_update']; @@ -150,15 +150,15 @@ class OrdersController extends BaseController } } else { if (!empty($orderStatus1CToCodes)) { - $order->status_id = $statusId; - $order->substatus_id = $substatusId; + $order->status_id = $status->id; + $order->substatus_id = $substatus->id; } } $order->status_processing_1c = $statusId1C->id; if ($order->save()) { // Обновляем историю статусов - MarketplaceService::createOrUpdateStatusHistory($order->id, $statusId, $substatusId, [ + MarketplaceService::createOrUpdateStatusHistory($order->id, $status->id, $substatus->id, [ 'date' => date('Y-m-d H:i:s') ]); $result = [ -- 2.39.5