From 0562d46764e7dd7e6d1c4cd2544011b9bdc6c480 Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 19 Mar 2025 16:11:20 +0300
Subject: [PATCH] =?utf8?q?[ERP-356]=20=D0=B4=D0=BE=D0=BF.=D0=BF=D0=B0?=
 =?utf8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/api2/controllers/BonusController.php        |  9 +++++++--
 ...13_create_table_user_bonus_send_to_tg_logs.php |  3 +++
 erp24/records/UserBonusSendToTgLogs.php           | 15 +++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index d9e77dcd..2bb6068c 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -1211,9 +1211,11 @@ class BonusController extends BaseController
         LogService::apiLogs(1, json_encode($mess, JSON_UNESCAPED_UNICODE));
         file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__ . ' OK ', FILE_APPEND);
 
+        $totalBonus = $back10 + $back20;
+
         $input = [
             'phone' => $phone,
-            'bonusCount' => $back10 + $back20,
+            'bonusCount' => $totalBonus,
             'purchaseDate' => date("Y-m-d H:i:s"),
             'orderId' => $check_id,
         ];
@@ -1221,6 +1223,9 @@ class BonusController extends BaseController
         $userBonusSendToTgLogs = new UserBonusSendToTgLogs;
         $userBonusSendToTgLogs->input_hash = md5(Json::encode($input));
         $userBonusSendToTgLogs->input = Json::encode($input);
+        $userBonusSendToTgLogs->check_id = $check_id;
+        $userBonusSendToTgLogs->phone = $phone;
+        $userBonusSendToTgLogs->bonusCount = $totalBonus;
         $userBonusSendToTgLogs->status = 1;
         $userBonusSendToTgLogs->save();
         if ($userBonusSendToTgLogs->getErrors()) {
@@ -1228,7 +1233,7 @@ class BonusController extends BaseController
         }
         Yii::$app->queue->push(new SendBonusInfoToSiteJob($input));
 
-//        SiteService::notifySiteAboutBonuses($phone, $back10 + $back20, date("Y-m-d H:i:s"), $check_id);
+//        SiteService::notifySiteAboutBonuses($phone, $totalBonus, date("Y-m-d H:i:s"), $check_id);
 
         return $this->asJson($mess);
     }
diff --git a/erp24/migrations/m250319_054813_create_table_user_bonus_send_to_tg_logs.php b/erp24/migrations/m250319_054813_create_table_user_bonus_send_to_tg_logs.php
index c8071186..5f17db88 100755
--- a/erp24/migrations/m250319_054813_create_table_user_bonus_send_to_tg_logs.php
+++ b/erp24/migrations/m250319_054813_create_table_user_bonus_send_to_tg_logs.php
@@ -21,6 +21,9 @@ class m250319_054813_create_table_user_bonus_send_to_tg_logs extends Migration
                 'input' => $this->text()->null()->comment('Входной json'),
                 'output' => $this->text()->null()->comment('Выходной json'),
                 'status' => $this->integer()->notNull()->defaultValue(0)->comment('Кол-во упоминаний данной записи'),
+                'check_id' => $this->string(36)->notNull()->comment('guid чека'),
+                'phone' => $this->string()->notNull()->comment('телефон'),
+                'bonusCount' => $this->integer()->notNull()->comment('число бонусов')
             ]);
         }
     }
diff --git a/erp24/records/UserBonusSendToTgLogs.php b/erp24/records/UserBonusSendToTgLogs.php
index 2093bbb4..4638de62 100644
--- a/erp24/records/UserBonusSendToTgLogs.php
+++ b/erp24/records/UserBonusSendToTgLogs.php
@@ -12,6 +12,9 @@ use Yii;
  * @property string|null $input Входной json
  * @property string|null $output Выходной json
  * @property int $status Кол-во упоминаний данной записи
+ * @property string $check_id guid чека
+ * @property string $phone телефон
+ * @property int $bonusCount число бонусов
  */
 class UserBonusSendToTgLogs extends \yii\db\ActiveRecord
 {
@@ -29,11 +32,12 @@ class UserBonusSendToTgLogs extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['input_hash'], 'required'],
+            [['input_hash', 'check_id', 'phone', 'bonusCount'], 'required'],
             [['input', 'output'], 'string'],
-            [['status'], 'default', 'value' => null],
-            [['status'], 'integer'],
-            [['input_hash'], 'string', 'max' => 255],
+            [['status', 'bonusCount'], 'default', 'value' => null],
+            [['status', 'bonusCount'], 'integer'],
+            [['input_hash', 'phone'], 'string', 'max' => 255],
+            [['check_id'], 'string', 'max' => 36],
         ];
     }
 
@@ -48,6 +52,9 @@ class UserBonusSendToTgLogs extends \yii\db\ActiveRecord
             'input' => 'Input',
             'output' => 'Output',
             'status' => 'Status',
+            'check_id' => 'Check ID',
+            'phone' => 'Phone',
+            'bonusCount' => 'Bonus Count',
         ];
     }
 }
-- 
2.39.5