From 585aa07b638be2ab44154f685b9bd3483db589c4 Mon Sep 17 00:00:00 2001 From: fomichev Date: Thu, 17 Jul 2025 16:00:11 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B0?= =?utf8?q?=20=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= =?utf8?q?=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 89ed6c11..d087bd2a 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -210,6 +210,12 @@ class DataController extends BaseController $mess['create_orders'] = $newOrdersArray; } $mess['line'][] = __LINE__; + $cancelledOrdersArray = $this->getCancelledMarketplaceOrders(); + if (!empty($cancelledOrdersArray)) { + $mess['line'][] = __LINE__; + $mess['cancel_order'] = $cancelledOrdersArray; + } + $mess['line'][] = __LINE__; } // $mess['delete_employee'] = [ @@ -289,6 +295,12 @@ class DataController extends BaseController $mess['create_orders'] = $newOrdersArray; } $mess['line'][] = __LINE__; + $cancelledOrdersArray = $this->getCancelledMarketplaceOrders(); + if (!empty($cancelledOrdersArray)) { + $mess['line'][] = __LINE__; + $mess['cancel_order'] = $cancelledOrdersArray; + } + $mess['line'][] = __LINE__; } LogService::apiDataLogs(1, json_encode($mess, JSON_UNESCAPED_UNICODE), $jsonId); Yii::error('Логи запроса ' . $jsonId . ' ' . json_encode($mess, JSON_UNESCAPED_UNICODE)); @@ -884,6 +896,32 @@ class DataController extends BaseController return $result; } + + private function getCancelledMarketplaceOrders(): array { + $canceledStatusId = MarketplaceOrderStatusTypes::find() + ->where(['code' => 'CANCELLED']) + ->scalar(); + $marketplaceOrders = MarketplaceOrders::find()->with('items') + ->where([ + 'status_id' => $canceledStatusId + ]) + ->andWhere([ + 'between', + 'creation_date', + date('Y-m-d 00:00:00', strtotime('-3 weeks', time())), + date('Y-m-d 23:59:59', time()) + ]) + ->all(); + $result = []; + foreach ($marketplaceOrders as $marketplaceOrder) { + /* @var MarketplaceOrders $marketplaceOrder */ + $result[] = [ + 'order_id' => $marketplaceOrder->guid ]; + + } + return $result; + } + public function actionUpload() { set_time_limit(600); -- 2.39.5