]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Убираем условие проверки созданных чеков на наличие kkm_id
authorfomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 16 Jul 2025 11:42:38 +0000 (14:42 +0300)
committerfomichev <vladimir.fomichev@erp-flowers.ru>
Wed, 16 Jul 2025 11:42:38 +0000 (14:42 +0300)
erp24/api2/controllers/DataController.php

index 3c5483428777d3f3f8b5a899042b1fb631484a8a..d5f325703820e0f9c80c9e002e5fe0365c670430 100644 (file)
@@ -124,25 +124,23 @@ class DataController extends BaseController
                 ->orderBy(['date' => SORT_DESC])->limit(10)->all();
             foreach ($createChecks as $createCheck) {
                 /** @var $createCheck CreateChecks */
-                if (!empty($createCheck->kkm_id)) {
-                    $mess["create_checks"][] = [
-                        "phone" => $createCheck->phone,
-                        "kkm_id" => $createCheck->kkm_id,
-                        "store_id" => $createCheck->store_id,
-                        "seller_id" => $createCheck->seller_id,
-                        "order_id" => trim($createCheck->order_id),
-                        "type" => $createCheck->type,
-                        "id" => $createCheck->check_id,
-                        "sales_check" => $createCheck->sales_check,
-                        "items" => json_decode($createCheck->items, true, 512, JSON_UNESCAPED_UNICODE),
-                        "payments" => json_decode(empty($createCheck->payments) ? '[]' : $createCheck->payments, true, 512, JSON_UNESCAPED_UNICODE),
-                        'order_guid' => $createCheck->order_guid,
-                        'order_marketplace' => $createCheck->marketplace_order_id,
-                        'guid' => $createCheck->guid,
-                        'is_marketplace' => $createCheck->is_marketplace,
-                        'marketplace_name' => $createCheck->marketplace_name,
-                    ];
-                }
+                $mess["create_checks"][] = [
+                    "phone" => $createCheck->phone,
+                    "kkm_id" => $createCheck->kkm_id,
+                    "store_id" => $createCheck->store_id,
+                    "seller_id" => $createCheck->seller_id,
+                    "order_id" => trim($createCheck->order_id),
+                    "type" => $createCheck->type,
+                    "id" => $createCheck->check_id,
+                    "sales_check" => $createCheck->sales_check,
+                    "items" => json_decode($createCheck->items, true, 512, JSON_UNESCAPED_UNICODE),
+                    "payments" => json_decode(empty($createCheck->payments) ? '[]' : $createCheck->payments, true, 512, JSON_UNESCAPED_UNICODE),
+                    'order_guid' => $createCheck->order_guid,
+                    'order_marketplace' => $createCheck->marketplace_order_id,
+                    'guid' => $createCheck->guid,
+                    'is_marketplace' => $createCheck->is_marketplace,
+                    'marketplace_name' => $createCheck->marketplace_name,
+                ];
             }
 
 //            $createChecksBags = CreateChecksBags::find()->where(['status' => '0'])->all();
@@ -219,6 +217,7 @@ class DataController extends BaseController
         } catch (Exception $e) {
             $mess['line'][] = ' error ' . __LINE__;
             file_put_contents(self::OUT_DIR . '/request_error.txt', PHP_EOL . date("d.m.Y H:i:s", time()) . $e->getMessage() . ' ' . $e->getFile() . ' ' . $e->getLine(), FILE_APPEND);
+            LogService::apiDataLogs(1, $e->getMessage() . ' ' . $e->getFile() . ' ' . $e->getLine(), time());
         } finally {
             $jsonArray = [];
             $apiCron = ApiCron::find()->where(['status' => 0])->orderBy(['date' => SORT_ASC])->one();
@@ -289,6 +288,7 @@ class DataController extends BaseController
                 $mess['line'][] = __LINE__;
             }
             LogService::apiDataLogs(1, json_encode($mess, JSON_UNESCAPED_UNICODE), $jsonId);
+            Yii::error('Логи запроса ' . $jsonId . ' ' . json_encode($mess, JSON_UNESCAPED_UNICODE));
         }
 
         return $this->asJson(json_decode($json, true));