From 58075c37a59a7792acf4e6a2a9932299c693ba91 Mon Sep 17 00:00:00 2001
From: xiaomlove <beixiao2777@gmail.com>
Date: Thu, 11 Sep 2025 00:27:24 +0700
Subject: [PATCH] fix CalculateUserSeedBonus reset user seedbouns/seed_points

---
 app/Http/Controllers/TorrentController.php |  2 +-
 app/Jobs/CalculateUserSeedBonus.php        | 19 ++++++++++++-------
 include/constants.php                      |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php
index 0883ed26..c8a3643a 100644
--- a/app/Http/Controllers/TorrentController.php
+++ b/app/Http/Controllers/TorrentController.php
@@ -63,7 +63,7 @@ class TorrentController extends Controller
         $resource = new TorrentResource($torrent);
         $additional = [];
         if ($this->hasExtraField('bonus_reward_values')) {
-            $additional['bonus_reward_values'] = Torrent::BONUS_REWARD_VALUES;
+            $additional['bonus_reward_values'] = Setting::getBonusRewardOptions();
         }
         $extraSettingsNames = ['torrent.claim_torrent_user_counts_up_limit'];
         $this->appendExtraSettings($additional, $extraSettingsNames);
diff --git a/app/Jobs/CalculateUserSeedBonus.php b/app/Jobs/CalculateUserSeedBonus.php
index 992135d6..e80157f3 100644
--- a/app/Jobs/CalculateUserSeedBonus.php
+++ b/app/Jobs/CalculateUserSeedBonus.php
@@ -107,10 +107,15 @@ class CalculateUserSeedBonus implements ShouldQueue
             $bonusLog = "[CLEANUP_CLI_CALCULATE_SEED_BONUS_HANDLE_USER], user: $uid, seedBonusResult: " . nexus_json_encode($seedBonusResult);
             $all_bonus = $basicBonus = $seedBonusResult['seed_bonus'];
             $bonusLog .= ", all_bonus: $all_bonus";
-            if ($all_bonus == 0) {
-                do_log("$bonusLog, all_bonus is zero, skip");
-                continue;
-            }
+            /**
+             * BUG: can't add this, case when not include info in where condition $idStr will be reset to 0
+             * // BUG: 不能添加这部分，case when 不包含某些 uid 的数据，而 $idStr 里面又有，会被重置为 0
+             * // 而且 seed_points_per_hour, seeding count/size  这些也是要实时更新为0的，不能添加这个跳过。
+             */
+//            if ($all_bonus == 0) {
+//                do_log("$bonusLog, all_bonus is zero, skip");
+//                continue;
+//            }
             if ($isDonor && $donortimes_bonus != 0) {
                 $donorAddition = $basicBonus * $donortimes_bonus;
                 $all_bonus += $donorAddition;
@@ -146,7 +151,7 @@ class CalculateUserSeedBonus implements ShouldQueue
             $seedingTorrentSizeUpdates[] = sprintf("when %d then %f", $uid, $seedBonusResult['size']);
             $seedBonusUpdates[] = sprintf("when %d then seedbonus + %f", $uid, $all_bonus);
             //here before/after not correct, don't record it, fill with -1
-            $this->appendBonusLogInsert($bonusLogInsert, $uid, [
+            $this->appendBonusLogInsert($bonusLogInsert, $userInfo, [
                 BonusLogs::BUSINESS_TYPE_SEEDING_BASIC => $basicBonus,
                 BonusLogs::BUSINESS_TYPE_SEEDING_DONOR_ADDITION => $donorAddition,
                 BonusLogs::BUSINESS_TYPE_SEEDING_OFFICIAL_ADDITION => $officialAddition,
@@ -198,13 +203,13 @@ class CalculateUserSeedBonus implements ShouldQueue
         do_log("failed: " . $exception->getMessage() . $exception->getTraceAsString(), 'error');
     }
 
-    private function appendBonusLogInsert(array &$bonusLogInsert, int $userId, array $typeValues): void
+    private function appendBonusLogInsert(array &$bonusLogInsert, array $userInfo, array $typeValues): void
     {
         foreach ($typeValues as $type => $value) {
             if ($value > 0) {
                 $bonusLogInsert[] = [
                     'business_type' => $type,
-                    'uid' => $userId,
+                    'uid' => $userInfo['id'],
                     'old_total_value' => -1,
                     'value' => $value,
                     'new_total_value' => -1,
diff --git a/include/constants.php b/include/constants.php
index b5ef7f07..bb102bcb 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.9.7');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-09-08');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-09-11');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");