From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 16 Jul 2025 13:18:58 +0000 (+0300)
Subject: Исправление получения статусов
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f0126bceb4dd6efc572f353c36a1cf85bd07ce03;p=erp24_rep%2Fyii-erp24%2F.git

Исправление получения статусов
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 65836751..b5447e6f 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -2906,13 +2906,13 @@ class DataController extends BaseController
             }
 
             // Получаем статусы МП по статусу 1С
-            $orderStatus1CToCodes = MarketplaceOrders::getStatusCodes($statusId1C->status);
+            $orderStatus1CToCodes = MarketplaceOrders::getStatusCodes($statusId1C->status_id);
 
             $statusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[0], $statuses, $statusCodes);
             $substatusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[1], $statuses, $statusCodes);
 
             if (
-                in_array($statusId1C->status, ['Отказ', 'Собрано']) &&
+                in_array($statusId1C->status_id, ['1013', '1010']) &&
                 $marketplaceOrder->marketplace_id == 2
             ) {
                 if (!$debug) {
diff --git a/erp24/api2/controllers/OrdersController.php b/erp24/api2/controllers/OrdersController.php
index cf566048..597102fd 100644
--- a/erp24/api2/controllers/OrdersController.php
+++ b/erp24/api2/controllers/OrdersController.php
@@ -114,13 +114,13 @@ class OrdersController extends BaseController
             }
 
             // Получаем статусы МП по статусу 1С
-            $orderStatus1CToCodes = MarketplaceOrders::getStatusCodes($statusId1C->status);
+            $orderStatus1CToCodes = MarketplaceOrders::getStatusCodes($statusId1C->status_id);
 
             $statusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[0], $statuses, $statusCodes);
             $substatusId = MarketplaceService::getOrCreateStatus($orderStatus1CToCodes[1], $statuses, $statusCodes);
 
             if (
-                in_array($statusId1C->status, ['Отказ', 'Собрано']) &&
+                in_array($statusId1C->status_id, ['1013', '1010']) &&
                 $order->marketplace_id == 2
             ) {
                 if (!$debug) {
diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index fe749077..5452066b 100644
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -68,17 +68,6 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
     public const PHOTO_TYPE = 'image';
     public const PHOTO_ORDER =  'marketplace_order/order_photo';
 
-
-    public const STATUSES_TO_CODE = [
-        'Новый' => ["PROCESSING", "STARTED"],
-        'Правки флориста' => ["PROCESSING", "STARTED"],
-        'В работе' => ["PROCESSING", "STARTED"],
-        'Собрано' => ["PROCESSING", "READY_TO_SHIP"],
-        'Передано курьеру' => ["DELIVERY", "COURIER_RECEIVED"],
-        'Успех' => ["DELIVERED", "DELIVERY_SERVICE_DELIVERED"],
-        'Отказ' => ["CANCELLED", "SHOP_FAILED"],
-    ];
-
     public function behaviors()
     {
         return [
@@ -201,7 +190,8 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
 
     public static function getStatusCodes(string $status): array
     {
-        return self::STATUSES_TO_CODE[$status] ?? [];
+        $statusesArray = MarketplaceOrders::buildStatusesToCode();
+        return $statusesArray[$status] ?? [];
     }
 
     /**
@@ -240,4 +230,14 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
         }
         return $result;
     }
+
+    public static function buildStatusesToCode(): array
+    {
+        return
+            array_fill_keys(['1000', '1001', '1002', '1007', '1008', '1009'], ['PROCESSING', 'STARTED']) +
+            array_fill_keys(['1003', '1010'], ['PROCESSING', 'READY_TO_SHIP']) +
+            array_fill_keys(['1004', '1011'], ['DELIVERY', 'COURIER_RECEIVED']) +
+            array_fill_keys(['1005', '1012'], ['DELIVERED', 'DELIVERY_SERVICE_DELIVERED']) +
+            array_fill_keys(['1006', '1013'], ['CANCELLED', 'SHOP_FAILED']);
+    }
 }