Skip to content

Commit 943e960

Browse files
committed
fix bonus log
1 parent 02a95cb commit 943e960

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

app/Console/Commands/NexusUpdate.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@ public function handle()
163163
$this->update->runExtraMigrate();
164164
$this->doLog("runExtraMigrate done!");
165165

166-
$logFile = getLogFile();
167-
$command = "chmod 777 $logFile";
168-
$this->doLog("$command...");
169-
executeCommand($command);
170-
171166
$this->doLog("All done!");
172167

173168
return 0;

app/Filament/Resources/System/PluginStoreResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static function getPluginInstruction(PluginStore $record): string
104104
$result = [];
105105
$result[] = "配置扩展地址";
106106
$result[] = sprintf("<code>composer config repositories.%s git %s</code>", $record->plugin_id, $record->remote_url);
107-
$result[] = "<br/>下载扩展. 这里展示的最新版本号, 如果要要安装其他版本自行替换(dev-master 代表开发中的版本)";
107+
$result[] = "<br/>下载扩展. 这里展示的最新版本号, 如果需要安装其他版本(可在查看页面底部获得)自行替换";
108108
$result[] = sprintf("<code>composer require %s:%s</code>", $record->package_name, $record->version);
109109
$result[] = "<br/>执行安装";
110110
$result[] = sprintf("<code>php artisan plugin install %s</code>", $record->package_name);

app/Repositories/BonusRepository.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ public function consumeUserBonus($user, $requireBonus, $logBusinessType, $logCom
325325
if (!isset(BonusLogs::$businessTypes[$logBusinessType])) {
326326
throw new \InvalidArgumentException("Invalid logBusinessType: $logBusinessType");
327327
}
328-
if (isset($userUpdates['seedbonus']) || isset($userUpdates['bonuscomment'])) {
329-
throw new \InvalidArgumentException("Not support update seedbonus or bonuscomment");
328+
if (isset($userUpdates['seedbonus']) || isset($userUpdates['bonuscomment']) || isset($userUpdates['modcomment'])) {
329+
throw new \InvalidArgumentException("Not support update seedbonus or bonuscomment or modcomment");
330330
}
331331
if ($requireBonus <= 0) {
332332
return;
@@ -337,14 +337,11 @@ public function consumeUserBonus($user, $requireBonus, $logBusinessType, $logCom
337337
throw new \LogicException("User bonus not enough.");
338338
}
339339
NexusDB::transaction(function () use ($user, $requireBonus, $logBusinessType, $logComment, $userUpdates) {
340-
$logComment = addslashes($logComment);
341-
$bonusComment = date('Y-m-d') . " - $logComment";
342340
$oldUserBonus = $user->seedbonus;
343341
$newUserBonus = bcsub($oldUserBonus, $requireBonus);
344342
$log = "user: {$user->id}, requireBonus: $requireBonus, oldUserBonus: $oldUserBonus, newUserBonus: $newUserBonus, logBusinessType: $logBusinessType, logComment: $logComment";
345343
do_log($log);
346344
$userUpdates['seedbonus'] = $newUserBonus;
347-
$userUpdates['bonuscomment'] = NexusDB::raw("if(bonuscomment = '', '$bonusComment', concat_ws('\n', '$bonusComment', bonuscomment))");
348345
$affectedRows = NexusDB::table($user->getTable())
349346
->where('id', $user->id)
350347
->where('seedbonus', $oldUserBonus)

0 commit comments

Comments
 (0)