mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 20:17:24 +08:00
fix bonus log
This commit is contained in:
@@ -163,11 +163,6 @@ class NexusUpdate extends Command
|
|||||||
$this->update->runExtraMigrate();
|
$this->update->runExtraMigrate();
|
||||||
$this->doLog("runExtraMigrate done!");
|
$this->doLog("runExtraMigrate done!");
|
||||||
|
|
||||||
$logFile = getLogFile();
|
|
||||||
$command = "chmod 777 $logFile";
|
|
||||||
$this->doLog("$command...");
|
|
||||||
executeCommand($command);
|
|
||||||
|
|
||||||
$this->doLog("All done!");
|
$this->doLog("All done!");
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ class PluginStoreResource extends Resource
|
|||||||
$result = [];
|
$result = [];
|
||||||
$result[] = "配置扩展地址";
|
$result[] = "配置扩展地址";
|
||||||
$result[] = sprintf("<code>composer config repositories.%s git %s</code>", $record->plugin_id, $record->remote_url);
|
$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[] = sprintf("<code>composer require %s:%s</code>", $record->package_name, $record->version);
|
||||||
$result[] = "<br/>执行安装";
|
$result[] = "<br/>执行安装";
|
||||||
$result[] = sprintf("<code>php artisan plugin install %s</code>", $record->package_name);
|
$result[] = sprintf("<code>php artisan plugin install %s</code>", $record->package_name);
|
||||||
|
|||||||
@@ -325,8 +325,8 @@ class BonusRepository extends BaseRepository
|
|||||||
if (!isset(BonusLogs::$businessTypes[$logBusinessType])) {
|
if (!isset(BonusLogs::$businessTypes[$logBusinessType])) {
|
||||||
throw new \InvalidArgumentException("Invalid logBusinessType: $logBusinessType");
|
throw new \InvalidArgumentException("Invalid logBusinessType: $logBusinessType");
|
||||||
}
|
}
|
||||||
if (isset($userUpdates['seedbonus']) || isset($userUpdates['bonuscomment'])) {
|
if (isset($userUpdates['seedbonus']) || isset($userUpdates['bonuscomment']) || isset($userUpdates['modcomment'])) {
|
||||||
throw new \InvalidArgumentException("Not support update seedbonus or bonuscomment");
|
throw new \InvalidArgumentException("Not support update seedbonus or bonuscomment or modcomment");
|
||||||
}
|
}
|
||||||
if ($requireBonus <= 0) {
|
if ($requireBonus <= 0) {
|
||||||
return;
|
return;
|
||||||
@@ -337,14 +337,11 @@ class BonusRepository extends BaseRepository
|
|||||||
throw new \LogicException("User bonus not enough.");
|
throw new \LogicException("User bonus not enough.");
|
||||||
}
|
}
|
||||||
NexusDB::transaction(function () use ($user, $requireBonus, $logBusinessType, $logComment, $userUpdates) {
|
NexusDB::transaction(function () use ($user, $requireBonus, $logBusinessType, $logComment, $userUpdates) {
|
||||||
$logComment = addslashes($logComment);
|
|
||||||
$bonusComment = date('Y-m-d') . " - $logComment";
|
|
||||||
$oldUserBonus = $user->seedbonus;
|
$oldUserBonus = $user->seedbonus;
|
||||||
$newUserBonus = bcsub($oldUserBonus, $requireBonus);
|
$newUserBonus = bcsub($oldUserBonus, $requireBonus);
|
||||||
$log = "user: {$user->id}, requireBonus: $requireBonus, oldUserBonus: $oldUserBonus, newUserBonus: $newUserBonus, logBusinessType: $logBusinessType, logComment: $logComment";
|
$log = "user: {$user->id}, requireBonus: $requireBonus, oldUserBonus: $oldUserBonus, newUserBonus: $newUserBonus, logBusinessType: $logBusinessType, logComment: $logComment";
|
||||||
do_log($log);
|
do_log($log);
|
||||||
$userUpdates['seedbonus'] = $newUserBonus;
|
$userUpdates['seedbonus'] = $newUserBonus;
|
||||||
$userUpdates['bonuscomment'] = NexusDB::raw("if(bonuscomment = '', '$bonusComment', concat_ws('\n', '$bonusComment', bonuscomment))");
|
|
||||||
$affectedRows = NexusDB::table($user->getTable())
|
$affectedRows = NexusDB::table($user->getTable())
|
||||||
->where('id', $user->id)
|
->where('id', $user->id)
|
||||||
->where('seedbonus', $oldUserBonus)
|
->where('seedbonus', $oldUserBonus)
|
||||||
|
|||||||
Reference in New Issue
Block a user