From 9d4857bec59b6d68ac92e5d1fd7ca808320004cc Mon Sep 17 00:00:00 2001 From: fomichev Date: Tue, 24 Jun 2025 15:18:26 +0300 Subject: [PATCH] =?utf8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D1=80=D0=B5?= =?utf8?q?=D0=B6=D0=B8=D0=BC=20=D0=BE=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8?= =?utf8?q?=20=D0=B2=20=D0=BF=D0=B8=D1=81=D1=8C=D0=BC=D0=B0=D1=85=20=D0=B8?= =?utf8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81=D0=B2?= =?utf8?q?=D0=BE=D0=B9=20=D0=B8=D0=B4=20=D1=82=D0=B5=D0=BB=D0=B5=D0=B3?= =?utf8?q?=D1=80=D0=B0=D0=BC=D0=B0=20=D0=B2=20=D1=83=D0=BC=D0=B2=D0=B5?= =?utf8?q?=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0?= =?utf8?q?=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/jobs/SendTelegramTestMessageJob.php | 2 +- erp24/services/MarketplaceService.php | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/erp24/jobs/SendTelegramTestMessageJob.php b/erp24/jobs/SendTelegramTestMessageJob.php index f6618d7e..43be5c11 100644 --- a/erp24/jobs/SendTelegramTestMessageJob.php +++ b/erp24/jobs/SendTelegramTestMessageJob.php @@ -34,7 +34,7 @@ class SendTelegramTestMessageJob extends \yii\base\BaseObject implements JobInte $botToken = TelegramService::TELEGRAM_BOT_DEV; $apiURL = "https://api.telegram.org/bot{$botToken}/sendMessage"; - $chats = ['337084327', '5489795686']; //Алексей + $chats = ['337084327', '730432579']; //Алексей $message = TelegramService::escapeMarkdown($message); $client = new Client(); foreach ($chats as $chatId) { diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php index 9650a907..10211d25 100644 --- a/erp24/services/MarketplaceService.php +++ b/erp24/services/MarketplaceService.php @@ -1035,7 +1035,7 @@ class MarketplaceService if ($marketplaceOrder->save()) { - self::sendMessageToTelegram($marketplaceOrder->guid, "Тестовое сообщение для https://tracker.yandex.ru/ERP-326 из [1]"); + self::sendMessageToTelegram($marketplaceOrder->guid, "Новый заказ из ЯМ"); $newOrdersCount += 1; // Создаем запись истории статусов @@ -1489,7 +1489,7 @@ class MarketplaceService ) { imap_errors(); imap_alerts(); - $debugMode = true; + $debugMode = false; set_time_limit(300); // Устанавливаем таймауты IMAP @@ -1552,7 +1552,7 @@ class MarketplaceService if ($progressCallback) { call_user_func($progressCallback, "Подключение к почтовому ящику..." . date('Y-m-d H:i:s')); } - //self::imap_debug_log("Открытие соединения: {$hostname} INBOX с почтой: {$username}", $debugMode, $progressCallback); + self::imap_debug_log("Открытие соединения: {$hostname} INBOX с почтой: {$username}", $debugMode, $progressCallback); $inbox = imap_open($hostname . 'INBOX', $username, $password); if (!$inbox) { self::imap_debug_log("Попытка не удалась: " . imap_last_error(), $debugMode, $progressCallback); @@ -1581,7 +1581,7 @@ class MarketplaceService if ($progressCallback) { call_user_func($progressCallback, "Поиск писем в папке: $folder..."); } - // self::imap_debug_log("Поисковой запрос: {$searchCriteria}", $debugMode, $progressCallback); + self::imap_debug_log("Поисковой запрос: {$searchCriteria}", $debugMode, $progressCallback); $emails = imap_search($inbox, $searchCriteria); self::check_imap_errors($debugMode, $progressCallback); @@ -1639,9 +1639,9 @@ class MarketplaceService 'date' => $date, 'body' => $htmlMessage, ]; - Yii::error('Сообщение' . json_encode($message, JSON_UNESCAPED_UNICODE)); + $output = MarketplaceService::processMessage($message); - Yii::error('Вывод' . $output); + if ($output > 0) { self::imap_debug_log("Установка флага SEEN для сообшения #" . $email_number, $debugMode, $progressCallback); $result = imap_setflag_full($inbox, $email_number, "\\Seen"); @@ -2022,19 +2022,17 @@ class MarketplaceService $statusId = self::getOrCreateStatus($statusCode, $statuses, $statusCodes); $substatusId = self::getOrCreateStatus($substatusCode, $statuses, $statusCodes); - Yii::warning("Статус " . $statusId); - Yii::warning("Субстатус " . $substatusId); + $marketplaceOrder = MarketplaceOrders::find() ->where(['marketplace_order_id' => (string)$orderNumber]) ->one(); if (!$marketplaceOrder) { - Yii::warning("Номер " . json_encode($orderNumber, JSON_UNESCAPED_UNICODE)); - Yii::warning("Заказ " . json_encode($orderDetails, JSON_UNESCAPED_UNICODE)); + 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]"); + self::sendMessageToTelegram($marketplaceOrder->guid, "Новый заказ Флаувау"); $newOrdersCount += 1; self::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, $orderDetails); self::saveOrderItems($orderDetails, $marketplaceOrder->id, $marketplaceOrder->warehouse_guid); -- 2.39.5