From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 21 Mar 2025 13:11:44 +0000 (+0300)
Subject: [ERP-326] fix
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=4d7691ee9c892b1523f1b422c6ad0aede103420d;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-326] fix
---

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 30cc89c7..17086962 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -922,6 +922,14 @@ class MarketplaceService
         }
     }
 
+    public static function sendMessageToTelegram($guid, $message)
+    {
+        Yii::$app->queue->push(new \yii_app\jobs\SendTelegramTestMessageJob([
+            'message' => $message,
+            'guid' => $guid,
+        ]));
+    }
+
     public static function processOrders(array $allOrders)
     {
         $statuses = MarketplaceOrderStatusTypes::find()
@@ -1013,11 +1021,7 @@ class MarketplaceService
                     $marketplaceOrder->raw_data = $newRawData;
 
                     if ($marketplaceOrder->save()) {
-
-                        Yii::$app->queue->push(new \yii_app\jobs\SendTelegramTestMessageJob([
-                            'message' => "Тестовое сообщение для https://tracker.yandex.ru/ERP-326 из afterSave",
-                            'guid' => $marketplaceOrder->guid,
-                        ]));
+                        self::sendMessageToTelegram($marketplaceOrder->guid, "Тестовое сообщение для https://tracker.yandex.ru/ERP-326 из [1]");
 
                         $newOrdersCount += 1;
                         // Создаем запись истории статусов
@@ -1144,7 +1148,14 @@ class MarketplaceService
                         $marketplaceOrder->status_id = (int)$statusId;
                         $marketplaceOrder->substatus_id = (int)$substatusId;
                         $marketplaceOrder->updated_at = date('Y-m-d H:i:s', strtotime($order->getUpdatedAt()));
-                        $marketplaceOrder->save();
+                        if (!$marketplaceOrder->save()) {
+                            Yii::error(
+                                'Ошибка сохранения: ' . json_encode(
+                                    $marketplaceOrder->getErrors(),
+                                    JSON_UNESCAPED_UNICODE
+                                )
+                            );
+                        }
                         $updatedOrdersCount += 1;
                         // Обновление истории статусов, если изменился статус
                         $statusHistoryRecord = MarketplaceOrderStatusHistory::find()
@@ -1749,6 +1760,7 @@ class MarketplaceService
             if ($index == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
                 $marketplaceOrder = self::createOrder($orderDetails, $campaignId, $statusId, $substatusId);
                 if ($marketplaceOrder->save()) {
+                    self::sendMessageToTelegram($marketplaceOrder->guid, "Тестовое сообщение для https://tracker.yandex.ru/ERP-326 из [2]");
                      $newOrdersCount += 1;
                      self::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, $orderDetails);
                      self::saveOrderItems($orderDetails, $marketplaceOrder->id, $marketplaceOrder->warehouse_guid);