From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 13 Oct 2025 10:46:40 +0000 (+0300)
Subject: Добавление обработки флаувау
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b02f51cbba1a1a43f69d1ab3c4110502803fbf0b;p=erp24_rep%2Fyii-erp24%2F.git

Добавление обработки флаувау
---

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);