Дубликаты доставок

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 83c32835587835d3ea0e842191f52b57b6d33d14..62136484e58532dce3dc62267112b9fb34832694 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1107,7 +1107,7 @@ class MarketplaceService
     public static function fetchOrder($campaignId, $orderId, string $contentType = null)
     {
         $config = Configuration::getDefaultConfiguration()
-            ->setApiKey('Api-Key', Yii::$app->params['YANDEX_MARKET_API_KEY']);
+                ->setApiKey('Api-Key', Yii::$app->params['YANDEX_MARKET_API_KEY']);
         $apiInstance = new OrdersApi(new Client(), $config);
 
         if ($contentType === null) {
@@ -2945,8 +2945,15 @@ class MarketplaceService
     public static function saveFromDeliveryText(int $orderId, string $deliveryText): bool
     {
         $order = MarketplaceOrders::find()->where(['id' => $orderId])->one();
-        $model = new MarketplaceOrderDelivery();
-        $model->order_id = $orderId;
+
+        // Ищем существующую доставку или создаем новую
+        $model = MarketplaceOrderDelivery::findOne(['order_id' => $orderId]);
+        if (!$model) {
+            $model = new MarketplaceOrderDelivery();
+            $model->order_id = $orderId;
+        }
+
+        // Обновляем данные доставки (могут измениться в последующих письмах)
         $model->country = 'Россия';
         $model->postcode = null;
         $model->apartment = null;