From: Vladimir Fomichev Date: Wed, 3 Sep 2025 12:40:33 +0000 (+0300) Subject: Меняем числовые значения маркетплейсов на константы X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=38259eca94945c3b9742f97acc12872244bc3bf3;p=erp24_rep%2Fyii-erp24%2F.git Меняем числовые значения маркетплейсов на константы --- diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index e9e27a1b..dbad9088 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -28,6 +28,7 @@ use yii_app\records\MarketplaceOrder1cStatuses; use yii_app\records\MarketplaceOrderDelivery; use yii_app\records\MarketplaceOrders; use yii_app\records\MarketplaceOrderStatusTypes; +use yii_app\records\MarketplaceStore; use yii_app\records\OrdersAmo; use yii_app\records\PaymentTypes; use yii_app\records\Prices; @@ -866,7 +867,7 @@ class DataController extends BaseController $delivery = is_string($marketplaceOrder->raw_data) ? json_decode($marketplaceOrder->raw_data, true)['delivery'] ?? [] : $marketplaceOrder->raw_data['delivery'] ?? []; - if ($marketplaceOrder->marketplace_id == 2) { + if ($marketplaceOrder->marketplace_id == MarketplaceStore::YANDEX_WAREHOUSE_ID) { $delivery = array_intersect_key($delivery, array_flip(['address', 'date', 'notes'])); } if (!empty($delivery)) { @@ -3043,7 +3044,7 @@ class DataController extends BaseController if ( in_array($statusId1C->status_id, ['1013', '1010']) && - $marketplaceOrder->marketplace_id == 2 + $marketplaceOrder->marketplace_id == MarketplaceStore::YANDEX_WAREHOUSE_ID ) { if (!$debug) { $updateResult = MarketplaceService::updateOrderStatus( diff --git a/erp24/api2/controllers/YandexMarketController.php b/erp24/api2/controllers/YandexMarketController.php index d408d45b..2217b3fc 100644 --- a/erp24/api2/controllers/YandexMarketController.php +++ b/erp24/api2/controllers/YandexMarketController.php @@ -205,7 +205,7 @@ class YandexMarketController extends Controller $campaignIds = MarketplaceStore::find() ->select(['warehouse_guid']) - ->where(['warehouse_id' => 2]) + ->where(['warehouse_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID]) ->column(); $allOrders = MarketplaceService::fetchOrders($campaignIds, $fromDate, $toDate, $status, $substatus); diff --git a/erp24/commands/MarketplaceController.php b/erp24/commands/MarketplaceController.php index 1777a3bb..b1a5b27d 100644 --- a/erp24/commands/MarketplaceController.php +++ b/erp24/commands/MarketplaceController.php @@ -45,7 +45,7 @@ class MarketplaceController extends Controller public $unseen; public function actionYandex() { - $infoForMarketplace = MarketplaceService::infoForMarketplace(2); + $infoForMarketplace = MarketplaceService::infoForMarketplace(MarketplaceStore::YANDEX_WAREHOUSE_ID); $config = Configuration::getDefaultConfiguration()->setApiKey('Api-Key', Yii::$app->params['YANDEX_MARKET_API_KEY']); @@ -62,7 +62,7 @@ class MarketplaceController extends Controller ]; } - $campaignIds = ArrayHelper::map(MarketplaceStore::find()->where(['warehouse_id' => 2])->all(), 'warehouse_guid', 'guid'); + $campaignIds = ArrayHelper::map(MarketplaceStore::find()->where(['warehouse_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID])->all(), 'warehouse_guid', 'guid'); foreach (array_keys($campaignIds) as $campaignId) { $apiInstance = new Api\HiddenOffersApi(new GuzzleHttp\Client(), $config); @@ -138,7 +138,7 @@ class MarketplaceController extends Controller $campaignIds = MarketplaceStore::find() ->select(['warehouse_guid']) - ->where(['warehouse_id' => 2]) + ->where(['warehouse_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID]) ->column(); $allOrders = MarketplaceService::fetchOrders($campaignIds, $fromDate, $toDate, $status, $substatus); @@ -172,7 +172,7 @@ class MarketplaceController extends Controller // php yii marketplace/fix-json-encoding public function actionFixJsonEncoding() { $yandexOrders = MarketplaceOrders::find() - ->where(['marketplace_id' => 2]) + ->where(['marketplace_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID]) ->all(); foreach ($yandexOrders as $yandexOrder) { $rawJsonString = $yandexOrder->raw_data; diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php index a56526cc..023f800a 100644 --- a/erp24/controllers/MarketplaceOrdersController.php +++ b/erp24/controllers/MarketplaceOrdersController.php @@ -110,7 +110,7 @@ class MarketplaceOrdersController extends Controller $orderNumber = mt_rand(10_000_000, 99_999_999); $now = date('Y-m-d H:i:s'); - if ($mp == 1) { + if ($mp == MarketplaceStore::FLOWWOW_WAREHOUSE_ID) { $orderDetails = [ 'number' => $orderNumber, 'date' => $now, @@ -252,7 +252,7 @@ class MarketplaceOrdersController extends Controller return $this->redirect(['index']); } - if ($mp == 2) { + if ($mp == MarketplaceStore::YANDEX_WAREHOUSE_ID) { $raw = [ "id" => $orderNumber, "status" => "PROCESSING", @@ -335,7 +335,7 @@ class MarketplaceOrdersController extends Controller $m = new MarketplaceOrders(); $m->marketplace_order_id = (string)$orderNumber; - $m->marketplace_id = 2; + $m->marketplace_id = MarketplaceStore::YANDEX_WAREHOUSE_ID; $m->marketplace_name = 'ЯндексМаркет'; $m->creation_date = date('Y-m-d H:i:s', strtotime($raw['creationDate'])); $m->updated_at = date('Y-m-d H:i:s', strtotime($raw['updatedAt'])); @@ -551,7 +551,7 @@ class MarketplaceOrdersController extends Controller // Yii::error('Ошибка сохранения ссылки' . json_encode($order->getErrors(), JSON_UNESCAPED_UNICODE), __METHOD__); // } // } - } elseif ($order->marketplace_id == 2) { + } elseif ($order->marketplace_id == MarketplaceStore::YANDEX_WAREHOUSE_ID) { $baseUrl = "https://partner.market.yandex.ru/order/"; $order->order_link = $baseUrl . $order->marketplace_order_id . "?tld=ru&partnerId=197274828"; if(!$order->save()) { @@ -620,7 +620,7 @@ class MarketplaceOrdersController extends Controller } else { Yii::warning("Не удалось разобрать delivery: '{$deliveryText}'", __METHOD__); } - } elseif ($order->marketplace_id == 2) { + } elseif ($order->marketplace_id == MarketplaceStore::YANDEX_WAREHOUSE_ID) { // var_dump($data['delivery']['shipments']); die(); if (isset($data['delivery']) && isset($data['delivery']['shipments'])) { $deliveryData = $data['delivery']; @@ -673,7 +673,7 @@ class MarketplaceOrdersController extends Controller $model->status_id = $deliveredStatusId->id; $model->substatus_id = $deliveredSubstatusId->id; - if ((int)$model->marketplace_id === 2) { + if ((int)$model->marketplace_id === MarketplaceStore::YANDEX_WAREHOUSE_ID) { $rawData = json_decode($model->raw_data, true, 512, JSON_THROW_ON_ERROR); $rawData['status'] = $deliveredStatusId->code; $rawData['substatus'] = $deliveredSubstatusId->code; @@ -685,7 +685,7 @@ class MarketplaceOrdersController extends Controller } Yii::$app->session->setFlash('success', 'Статус заказа успешно обновлен.'); - } elseif ((int)$model->marketplace_id === 2) { + } elseif ((int)$model->marketplace_id === MarketplaceStore::YANDEX_WAREHOUSE_ID) { $updatedOrder = MarketplaceService::updateOrderStatus( $model->warehouse_guid, $model->marketplace_order_id, @@ -747,7 +747,7 @@ class MarketplaceOrdersController extends Controller if ($model->fake) { $model->status_id = $statusCancelled->id; $model->substatus_id = $substatusFailed->id; - if ((int)$model->marketplace_id === 2) { + if ((int)$model->marketplace_id === MarketplaceStore::YANDEX_WAREHOUSE_ID) { $rawData = json_decode($model->raw_data, true, 512, JSON_THROW_ON_ERROR); $rawData['status'] = $statusCancelled->code; $rawData['substatus'] = $substatusFailed->code; @@ -763,7 +763,7 @@ class MarketplaceOrdersController extends Controller return $this->redirect(['index']); } - if ((int)$model->marketplace_id === 2) { + if ((int)$model->marketplace_id === MarketplaceStore::YANDEX_WAREHOUSE_ID) { try { $updatedOrder = MarketplaceService::updateOrderStatus( $model->warehouse_guid, @@ -817,7 +817,7 @@ class MarketplaceOrdersController extends Controller public function actionYandexStocks() { - $infoForMarketplace = MarketplaceService::infoForMarketplace(2); + $infoForMarketplace = MarketplaceService::infoForMarketplace(MarketplaceStore::YANDEX_WAREHOUSE_ID); $products = Products1c::find()->alias('p')->leftJoin('products_class pc', 'p.parent_id = pc.category_id') ->where(['pc.tip' => [ProductsClass::MARKETPLACE, ProductsClass::MARKETPLACE_ADDITIONAL]])->all(); @@ -832,7 +832,7 @@ class MarketplaceOrdersController extends Controller ]; } - $campaignIds = ArrayHelper::map(MarketplaceStore::find()->where(['warehouse_id' => 2])->all(), 'warehouse_guid', 'guid'); + $campaignIds = ArrayHelper::map(MarketplaceStore::find()->where(['warehouse_id' => MarketplaceStore::YANDEX_WAREHOUSE_ID])->all(), 'warehouse_guid', 'guid'); $skus = []; foreach (array_keys($campaignIds) as $campaignId) { foreach ($infoForMarketplace as $storeId => $guidsWithCnt) { diff --git a/erp24/records/MarketplaceStore.php b/erp24/records/MarketplaceStore.php index 7137cfd3..756b4175 100644 --- a/erp24/records/MarketplaceStore.php +++ b/erp24/records/MarketplaceStore.php @@ -24,6 +24,8 @@ use yii\db\Expression; */ class MarketplaceStore extends \yii\db\ActiveRecord { + const FLOWWOW_WAREHOUSE_ID = 1; + const YANDEX_WAREHOUSE_ID = 2; /** * {@inheritdoc} */ diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php index 6f2332fa..1e6fbbae 100644 --- a/erp24/services/MarketplaceService.php +++ b/erp24/services/MarketplaceService.php @@ -101,7 +101,7 @@ class MarketplaceService if (!array_key_exists($marketId, MarketplaceStore::getWarehouseId())) return; - $is_yandex = $marketId == 2; + $is_yandex = $marketId == MarketplaceStore::YANDEX_WAREHOUSE_ID; // 1. Получение гуидов букетов $productsGroup = ProductsClass::find() @@ -1053,7 +1053,7 @@ class MarketplaceService } $marketplaceOrder->store_id = $store ? $store->store_id : null; $marketplaceOrder->warehouse_guid = $warehouseGuid; - $marketplaceOrder->marketplace_id = $store->warehouse_id ?? 2; + $marketplaceOrder->marketplace_id = $store->warehouse_id ?? MarketplaceStore::YANDEX_WAREHOUSE_ID; $warehouseNames = MarketplaceStore::getWarehouseId(); $marketplaceOrder->marketplace_name = $warehouseNames[$marketplaceOrder->marketplace_id]; } @@ -2184,7 +2184,7 @@ class MarketplaceService $marketplaceOrder->guid = DataHelper::createGuidMy('08'); $marketplaceOrder->fake = 0; $marketplaceOrder->marketplace_name = 'ФлауВау'; - $marketplaceOrder->marketplace_id = 1; + $marketplaceOrder->marketplace_id = MarketplaceStore::FLOWWOW_WAREHOUSE_ID; $marketplaceOrder->store_id = $store->store_id; $marketplaceOrder->status_1c = MarketplaceOrders::STATUSES_1C_CREATED_IN_ERP; //$marketplaceOrder->order_link = $order['orderLink'];