From b02f51cbba1a1a43f69d1ab3c4110502803fbf0b Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 13 Oct 2025 13:46:40 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?utf8?q?=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?utf8?q?=D0=B8=20=D1=84=D0=BB=D0=B0=D1=83=D0=B2=D0=B0=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 38f51369..4b41b3fa 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1355,6 +1355,7 @@ class MarketplaceService
                         $marketplaceOrder) {
                         /* @var $marketplaceOrder MarketplaceOrders */
                         $isCheckCreated = MarketplaceService::createCheckForMarketplaceOrder($marketplaceOrder);
+                        //$marketplaceOrder->status_processing_1c =
                     }
                     // Обновление существующего заказа, если данные изменились
                     if ($newRawData !== $marketplaceOrder->raw_data && $marketplaceOrder->guid != null) {
@@ -1950,7 +1951,17 @@ class MarketplaceService
         $count = 0;
         if ($message) {
             $store = MarketplaceStore::getWarehouseGuidByAccountEmail($message['to']) ?? 206008;
-
+            $statuses = MarketplaceOrderStatusTypes::find()
+                ->select(['id', 'code'])
+                ->indexBy('code')
+                ->asArray()
+                ->all();
+            $cancelledStatusId = $statuses[MarketplaceOrderStatusTypes::CANSELLED_CODE]['id'];
+            $status1cWithCancelledId = ArrayHelper::getColumn(MarketplaceOrder1cStatuses::find()
+                ->where(['order_status_id' => $cancelledStatusId])
+                ->andWhere(['marketplace_id' => 1])
+                ->asArray()
+                ->all(), 'id');
             $order = self::getOrdersDataFromMessage($message);
 
                 if ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
@@ -1978,10 +1989,11 @@ class MarketplaceService
                     /* @var $marketplaceOrder MarketplaceOrders */
                     $isCheckCreated = self::createCheckForMarketplaceOrder($marketplaceOrder);
                 }
-            if ($statusCode == 'CANCELLED' && $substatusCode == 'USER_CHANGED_MIND' && $marketplaceOrder) {
+            if ($statusCode == MarketplaceOrderStatusTypes::CANSELLED_CODE && $substatusCode == 'USER_CHANGED_MIND' && $marketplaceOrder) {
                 Yii::error('Заказ ' . $marketplaceOrder->marketplace_order_id);
                 /* @var $marketplaceOrder MarketplaceOrders */
                 $marketplaceOrder->cancelled_order_source = 'Flowwow';
+                $marketplaceOrder->status_processing_1c = $status1cWithCancelledId;
                 $marketplaceOrder->cancelled_order_date = date('Y-m-d H:m:s');
                 if (!$marketplaceOrder->save()) {
                     Yii::error('Метки отмены заказа не проставлены ' . $marketplaceOrder->marketplace_order_id);
-- 
2.39.5