Добавление привязки статусов заказа к статусу обработки 1С

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index a63624f87351272fbf910aabbd5e8fecebc65746..29c7850a265b247c8849356eb22eea10ecf83fbe 100644 (file)
--- 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 597102fd30a86eddd07438c4f02b08d0e5b9675c..88e270e9a3b500940ae791549db6fa2f4a198afc 100644 (file)
--- 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 = [