From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 4 Feb 2025 10:42:05 +0000 (+0300)
Subject: [ERP-297] burn balans
X-Git-Tag: 1.7~19^2~2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=3ca08f05d556b122ee92fb11c55104b8c283d527;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-297] burn balans
---

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index 05a074f1..f62f6cc0 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -748,6 +748,7 @@ class BonusController extends BaseController
 
             return $this->asJson($mess);
         }
+        $user->burn_balans = max(0, $user->burn_balans - $write_off_bonuses);
 
 // старая точка проверки кода
 //        file_put_contents(self::OUT_DIR . '/sale_bonuses_' . $fl . '.json', PHP_EOL . '--' . __LINE__, FILE_APPEND);
diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php
index 707ad91a..0c400f7d 100644
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -426,6 +426,7 @@ class CronController extends Controller
                     continue;
                 }
                 if (!in_array($phone, $userBonusExist)) {
+                    Users::updateAll(['burn_balans' => $bonus], ['phone' => '' . $phone]);
                     $userBonus4 = new UsersBonus();
                     $userBonus4->phone = '' . $phone;
                     $userBonus4->name = $name;
diff --git a/erp24/migrations/m250204_091639_alter_table_users_add_column_burn_balans.php b/erp24/migrations/m250204_091639_alter_table_users_add_column_burn_balans.php
new file mode 100755
index 00000000..6185bba7
--- /dev/null
+++ b/erp24/migrations/m250204_091639_alter_table_users_add_column_burn_balans.php
@@ -0,0 +1,27 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m250204_091639_alter_table_users_add_column_burn_balans
+ */
+class m250204_091639_alter_table_users_add_column_burn_balans extends Migration
+{
+    const TABLE_NAME = 'erp24.users';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->addColumn(self::TABLE_NAME, 'burn_balans', $this->float()->null()->after('balans')->comment('Сгораемый баланс'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn(self::TABLE_NAME, 'burn_balans');
+    }
+}
diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index c36834be..59056674 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -39,6 +39,7 @@ use yii\helpers\BaseConsole;
  * @property int|null $created_store_id
  * @property string $created_store
  * @property float $balans
+ * @property float $burn_balans
  * @property string|null $balans_datetime
  * @property float|null $bonus_minus
  * @property string|null $bdate день рождения
@@ -208,7 +209,7 @@ class Users extends \yii\db\ActiveRecord
                 ],
                 'integer'
             ],
-            [['balans', 'bonus_minus'], 'number'],
+            [['balans', 'burn_balans', 'bonus_minus'], 'number'],
             [['ref_code'], 'string', 'max' => 10],
             [['phone'], 'string', 'max' => 16],
             [['name', 'email_old'], 'string', 'max' => 55],
@@ -264,6 +265,7 @@ class Users extends \yii\db\ActiveRecord
             'created_store_id' => 'Created Store ID',
             'created_store' => 'Created Store',
             'balans' => 'Balans',
+            'burn_balans' => 'Сгораемый баланс',
             'balans_datetime' => 'Balans Datetime',
             'bonus_minus' => 'Bonus Minus',
             'bdate' => 'Bdate',