Проверка заказов на существующие по дате и маркетплейсу при создании заказа и добавле...

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 62136484e58532dce3dc62267112b9fb34832694..aa81ef2180638f76998312f6d670a2fc40dfde00 100644 (file)
--- 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);