From db7658b8f75eb82d68d8c7d77b81e3a55d3b498f Mon Sep 17 00:00:00 2001 From: Vladimir Fomichev Date: Thu, 16 Oct 2025 18:44:34 +0300 Subject: [PATCH] =?utf8?q?=D0=9C=D0=B5=D0=BD=D1=8F=D0=B5=D0=BC=20=D1=80?= =?utf8?q?=D0=B5=D0=BA=D0=B2=D0=B5=D1=81=D1=82=D0=98=D0=94=20=D0=BD=D0=B0?= =?utf8?q?=20=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=81=D0=B5=D0=BA=D1=83=D0=BD?= =?utf8?q?=D0=B4=D1=8B=20=D0=B2=20=D0=BA=D1=80=D0=BE=D0=BD=20=D0=BA=D0=BE?= =?utf8?q?=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/commands/CronController.php | 20 ++++++++++---------- erp24/services/UploadService.php | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php index c391ee2c..9ea8fd04 100644 --- a/erp24/commands/CronController.php +++ b/erp24/commands/CronController.php @@ -91,7 +91,7 @@ class CronController extends Controller //cron/one-c public function actionOneC() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $jsonString = '", "incomings":{"start_time":"' . date("Y-m-d", time() - 86400) . ' 00:00:00","end_time":"' . date("Y-m-d", time()) . ' 23:59:59"},'; $jsonString .= ' "checks":{"start_time":"' . date("Y-m-d", time() - 24400) . ' 00:00:00","end_time":"' . date("Y-m-d", time()) . ' 23:59:59"},'; $jsonString .= ' "write_offs":{"start_time":"' . date("Y-m-d", time() - 86400 * 7) . ' 00:00:00","end_time":"' . date("Y-m-d", time()) . ' 23:59:59"}}'; @@ -107,7 +107,7 @@ class CronController extends Controller //cron/marketplace-order-one-c-statuses public function actionMarketplaceOrderOneCStatuses() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $marketplaces = [ MarketplaceOrder1cStatuses::GUID_FLOWWOW => "ФлауВау", @@ -161,7 +161,7 @@ class CronController extends Controller //cron/one-c-check-one-day public function actionOneCCheckOneDay() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $json_post = '{"request_id": "' . $req_id . '" ,"checks":{"start_time":"' . date("Y-m-d", time() - 86400) . ' 00:00:00","end_time":"' . date("Y-m-d H:i:s", time()) . '"}}'; $this->setApiCron($req_id, $json_post); @@ -172,7 +172,7 @@ class CronController extends Controller //cron/one-c-sellers public function actionOneCSellers() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $jsonString = '", "nomenclature":true, "sellers":true, "balances":true, "payment_types":true}'; if(!CronController::checkApiCronTask($jsonString)) { @@ -186,7 +186,7 @@ class CronController extends Controller //cron/one-c-price public function actionOneCPrice() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $jsonString = '", "nomenclature":true, "sellers":true, "prices":{"type_price":"Розничная Маг на Московск"}, "balances":true, "payment_types":true}'; if (!CronController::checkApiCronTask($jsonString)) { @@ -200,7 +200,7 @@ class CronController extends Controller //cron/one-c-balances public function actionOneCBalances() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $jsonString = '", "balances":true}'; if (!CronController::checkApiCronTask($jsonString)) { @@ -214,7 +214,7 @@ class CronController extends Controller //cron/custom-one-c-cron public function actionCustomOneCCron() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); //чеки за 7 дней назад прогружаем $json_post = '{"request_id": "' . $req_id . '", "checks":{"start_time":"' . date("Y-m-d", time() - 86400 * 7) . ' 00:00:00","end_time":"' . date("Y-m-d", time()) . ' 23:59:59"}}'; @@ -227,7 +227,7 @@ class CronController extends Controller //cron/marketplace-orders-one-c-cron public function actionMarketplaceOrdersOneCCron() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $jsonString = '"marketplace_orders":{"start_time":"' . date("Y-m-d", time() - 86400 * 2) . ' 00:00:00","end_time":"' . date("Y-m-d", time()) . ' 23:59:59"}'; if (!CronController::checkApiCronTask($jsonString)) { @@ -242,7 +242,7 @@ class CronController extends Controller //cron/one-c-cron-self-cost-day public function actionOneCCronSelfCostDay() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); //себестоимость за текущий день $json_post = '{"request_id": "' . $req_id . '", "self_cost":{"start_time":"' . date("Y-m-d", time()) . ' 00:00:00","end_time":"' . date("Y-m-d", time()) . ' 23:59:59"}}'; @@ -255,7 +255,7 @@ class CronController extends Controller //cron/one-c-cron-analysts public function actionOneCCronAnalysts() { - $req_id = time(); + $req_id = DataHelper::getRequestId(); $jsonString = '", "analysts_business_operations": true}'; if (!CronController::checkApiCronTask($jsonString)) { diff --git a/erp24/services/UploadService.php b/erp24/services/UploadService.php index f8aa4220..b0acc744 100644 --- a/erp24/services/UploadService.php +++ b/erp24/services/UploadService.php @@ -7,6 +7,7 @@ use Yii; use yii\helpers\ArrayHelper; use yii\helpers\Json; use yii_app\helpers\ClientHelper; +use yii_app\helpers\DataHelper; use yii_app\helpers\SalaryHelper; use yii_app\records\Admin; use yii_app\records\AnalystsBusinessOperations; @@ -82,7 +83,7 @@ class UploadService { } $mess["result"] = true; $checks_dell = ""; - $requestId = time(); + $requestId = DataHelper::getRequestId(); if (array_key_exists("request_id", $result) && !empty($result["request_id"])) { $requestId = $result["request_id"]; } -- 2.39.5