From: Alexander Smirnov <fredeom@mail.ru>
Date: Tue, 4 Feb 2025 13:20:33 +0000 (+0300)
Subject: [ERP-297] поправка
X-Git-Tag: 1.7~19^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=47fc496811748d2273bd22d342f816798638eaf2;p=erp24_rep%2Fyii-erp24%2F.git

[ERP-297] поправка
---

diff --git a/erp24/api2/controllers/BonusController.php b/erp24/api2/controllers/BonusController.php
index f62f6cc0..7f2dc3ed 100644
--- a/erp24/api2/controllers/BonusController.php
+++ b/erp24/api2/controllers/BonusController.php
@@ -749,6 +749,7 @@ class BonusController extends BaseController
             return $this->asJson($mess);
         }
         $user->burn_balans = max(0, $user->burn_balans - $write_off_bonuses);
+        // [balans - burn_balance, burn_balans] - показать клиенту что мы сожгли сжигаемый баланс
 
 // старая точка проверки кода
 //        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 0c400f7d..2e184ced 100644
--- a/erp24/commands/CronController.php
+++ b/erp24/commands/CronController.php
@@ -426,7 +426,6 @@ 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;
@@ -443,6 +442,8 @@ class CronController extends Controller
                             json_encode($userBonus4->getErrors(), JSON_UNESCAPED_UNICODE) . " " . $key . "\n",
                             BaseConsole::FG_RED
                         );
+                    } else {
+                        Users::updateAll(['burn_balans' => $bonus], ['phone' => '' . $phone]);
                     }
                 }
             }