From 943e9609216528a3a40a7d76340e1349fa79f06c Mon Sep 17 00:00:00 2001
From: xiaomlove <1939737565@qq.com>
Date: Sun, 19 Jan 2025 22:47:39 +0800
Subject: [PATCH] fix bonus log

---
 app/Console/Commands/NexusUpdate.php                  | 5 -----
 app/Filament/Resources/System/PluginStoreResource.php | 2 +-
 app/Repositories/BonusRepository.php                  | 7 ++-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/Console/Commands/NexusUpdate.php b/app/Console/Commands/NexusUpdate.php
index 0f32d73f..725354a4 100644
--- a/app/Console/Commands/NexusUpdate.php
+++ b/app/Console/Commands/NexusUpdate.php
@@ -163,11 +163,6 @@ class NexusUpdate extends Command
         $this->update->runExtraMigrate();
         $this->doLog("runExtraMigrate done!");
 
-        $logFile = getLogFile();
-        $command = "chmod 777 $logFile";
-        $this->doLog("$command...");
-        executeCommand($command);
-
         $this->doLog("All done!");
 
         return 0;
diff --git a/app/Filament/Resources/System/PluginStoreResource.php b/app/Filament/Resources/System/PluginStoreResource.php
index 92922271..30f5104d 100644
--- a/app/Filament/Resources/System/PluginStoreResource.php
+++ b/app/Filament/Resources/System/PluginStoreResource.php
@@ -104,7 +104,7 @@ class PluginStoreResource extends Resource
         $result = [];
         $result[] = "配置扩展地址";
         $result[] = sprintf("<code>composer config repositories.%s git %s</code>", $record->plugin_id, $record->remote_url);
-        $result[] = "<br/>下载扩展. 这里展示的最新版本号, 如果要要安装其他版本自行替换(dev-master 代表开发中的版本)";
+        $result[] = "<br/>下载扩展. 这里展示的最新版本号, 如果需要安装其他版本(可在查看页面底部获得)自行替换";
         $result[] = sprintf("<code>composer require %s:%s</code>", $record->package_name, $record->version);
         $result[] = "<br/>执行安装";
         $result[] = sprintf("<code>php artisan plugin install %s</code>", $record->package_name);
diff --git a/app/Repositories/BonusRepository.php b/app/Repositories/BonusRepository.php
index 4f907346..dde05ab2 100644
--- a/app/Repositories/BonusRepository.php
+++ b/app/Repositories/BonusRepository.php
@@ -325,8 +325,8 @@ class BonusRepository extends BaseRepository
         if (!isset(BonusLogs::$businessTypes[$logBusinessType])) {
             throw new \InvalidArgumentException("Invalid logBusinessType: $logBusinessType");
         }
-        if (isset($userUpdates['seedbonus']) || isset($userUpdates['bonuscomment'])) {
-            throw new \InvalidArgumentException("Not support update seedbonus or bonuscomment");
+        if (isset($userUpdates['seedbonus']) || isset($userUpdates['bonuscomment']) || isset($userUpdates['modcomment'])) {
+            throw new \InvalidArgumentException("Not support update seedbonus or bonuscomment or modcomment");
         }
         if ($requireBonus <= 0) {
             return;
@@ -337,14 +337,11 @@ class BonusRepository extends BaseRepository
             throw new \LogicException("User bonus not enough.");
         }
         NexusDB::transaction(function () use ($user, $requireBonus, $logBusinessType, $logComment, $userUpdates) {
-            $logComment = addslashes($logComment);
-            $bonusComment = date('Y-m-d') . " - $logComment";
             $oldUserBonus = $user->seedbonus;
             $newUserBonus = bcsub($oldUserBonus, $requireBonus);
             $log = "user: {$user->id}, requireBonus: $requireBonus, oldUserBonus: $oldUserBonus, newUserBonus: $newUserBonus, logBusinessType: $logBusinessType, logComment: $logComment";
             do_log($log);
             $userUpdates['seedbonus'] = $newUserBonus;
-            $userUpdates['bonuscomment'] = NexusDB::raw("if(bonuscomment = '', '$bonusComment', concat_ws('\n', '$bonusComment', bonuscomment))");
             $affectedRows = NexusDB::table($user->getTable())
                 ->where('id', $user->id)
                 ->where('seedbonus', $oldUserBonus)