From 922571568ab6c8563d06b66806bcc4a79a5ab672 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Tue, 23 Dec 2025 14:26:15 +0300
Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?=
 =?utf8?q?=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=BD=D0=B0=20?=
 =?utf8?q?=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2=D1=83=D1=8E=D1=89?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=BF=D0=BE=20=D0=B4=D0=B0=D1=82=D0=B5=20=D0=B8?=
 =?utf8?q?=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B5=D1=82=D0=BF=D0=BB=D0=B5=D0=B9?=
 =?utf8?q?=D1=81=D1=83=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4?=
 =?utf8?q?=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0?=
 =?utf8?q?=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=D0=B0=20=D0=B7?=
 =?utf8?q?=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BE?=
 =?utf8?q?=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5=20=D1=83=D0=B2=D0=B5?=
 =?utf8?q?=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20?=
 =?utf8?q?=D1=82=D0=B5=D0=BB=D0=B5=D0=B3=D1=80=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/services/MarketplaceService.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 62136484..aa81ef21 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1224,6 +1224,8 @@ class MarketplaceService
                 $marketplaceOrder = MarketplaceOrders::find()
                     ->where(['marketplace_order_id' => (string)$order->getId()])
                     ->with(['status', 'substatus'])
+                    ->andWhere(['marketplace_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID])
+                    ->andWhere([ '>=','creation_date', date('Y-m-d H:i:s', strtotime('-1 month')) ])
                     ->one();
 
                 if (!$marketplaceOrder) {
@@ -1288,7 +1290,7 @@ class MarketplaceService
                             'marketplace_order_creation'
                         );
                         
-                        self::sendMessageToTelegram($marketplaceOrder->guid, "Новый заказ из ЯМ");
+                        self::sendMessageToTelegram($marketplaceOrder->guid, "Новый заказ из ЯМ №" . $marketplaceOrder->marketplace_order_id);
 
                         $newOrdersCount += 1;
                         // Создаем запись истории статусов
@@ -2669,13 +2671,15 @@ class MarketplaceService
 
         $marketplaceOrder = MarketplaceOrders::find()
             ->where(['marketplace_order_id' => (string)$orderNumber])
+            ->andWhere(['marketplace_id' => MarketplaceStore::FLOWWOW_WAREHOUSE_ID])
+            ->andWhere([ '>=','creation_date', date('Y-m-d H:i:s', strtotime('-1 month')) ])
             ->one();
 
         if (!$marketplaceOrder) {
             if ($index == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
                 $marketplaceOrder = self::createOrderFlowwow($orderDetails, $campaignId, $statusId, $substatusId);
                 if ($marketplaceOrder->save()) {
-                    self::sendMessageToTelegram($marketplaceOrder->guid, "Новый  заказ Флаувау");
+                    self::sendMessageToTelegram($marketplaceOrder->guid, "Новый  заказ Флаувау №" . $marketplaceOrder->marketplace_order_id);
                      $newOrdersCount += 1;
                      self::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, $orderDetails);
                      self::saveOrderItems($orderDetails, $marketplaceOrder->id, $marketplaceOrder->warehouse_guid);
-- 
2.39.5