From 950cfe1c8e32925b42ec8f1002d44ddb65452c11 Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Mon, 20 Feb 2023 00:06:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E5=85=85=E5=80=BC=E5=92=8C=E6=89=A3=E9=99=A4=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/ReduceBalance.php  | 14 +++++++-------
 app/Console/Commands/UserAddBalance.php | 12 +++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/Console/Commands/ReduceBalance.php b/app/Console/Commands/ReduceBalance.php
index 709fc7b..c38f9aa 100644
--- a/app/Console/Commands/ReduceBalance.php
+++ b/app/Console/Commands/ReduceBalance.php
@@ -5,6 +5,7 @@
 use App\Models\Transaction;
 use App\Models\User;
 use Illuminate\Console\Command;
+use Symfony\Component\Console\Command\Command as CommandAlias;
 
 class ReduceBalance extends Command
 {
@@ -20,7 +21,7 @@ class ReduceBalance extends Command
      *
      * @var string
      */
-    protected $description = '减少用户的余额（发生退款时使用）';
+    protected $description = '减少用户的余额。';
 
     /**
      * Create a new command instance.
@@ -35,12 +36,10 @@ public function __construct()
     /**
      * Execute the console command.
      *
-     * @return void
+     * @return int
      */
-    public function handle(): void
+    public function handle(): int
     {
-        //
-
         $user_id = $this->argument('user_id');
 
         $amount = $this->argument('amount');
@@ -55,13 +54,14 @@ public function handle(): void
 
         $confirm = $this->confirm('确认扣除？');
 
-        $transaction = new Transaction();
         if ($confirm) {
-            $transaction->reduceAmount($user_id, $amount, '控制台扣除。');
+            $user->reduce($amount, '控制台扣除。');
 
             $this->info('扣除成功。');
         } else {
             $this->info('取消扣除。');
         }
+
+        return CommandAlias::SUCCESS;
     }
 }
diff --git a/app/Console/Commands/UserAddBalance.php b/app/Console/Commands/UserAddBalance.php
index a531000..c18a163 100644
--- a/app/Console/Commands/UserAddBalance.php
+++ b/app/Console/Commands/UserAddBalance.php
@@ -5,6 +5,7 @@
 use App\Models\Transaction;
 use App\Models\User;
 use Illuminate\Console\Command;
+use Symfony\Component\Console\Command\Command as CommandAlias;
 
 class UserAddBalance extends Command
 {
@@ -20,7 +21,7 @@ class UserAddBalance extends Command
      *
      * @var string
      */
-    protected $description = '为用户充值，用法: 用户ID, 金额。';
+    protected $description = '为用户充值。';
 
     /**
      * Create a new command instance.
@@ -39,8 +40,6 @@ public function __construct()
      */
     public function handle(): int
     {
-        //
-
         $user_id = $this->argument('user_id');
         $amount = $this->argument('amount');
 
@@ -56,17 +55,16 @@ public function handle(): int
             return 0;
         }
 
-        $transaction = new Transaction();
-
         $description = '控制台充值 '.$amount.' 元';
 
-        $transaction->addAmount($user->id, 'console', $amount, $description, true);
+        $user->charge($amount, 'console', $description);
 
         $this->info('充值成功。');
 
         $user->refresh();
+
         $this->info($user->name.', 当前余额: '.$user->balance);
 
-        return 0;
+        return CommandAlias::SUCCESS;
     }
 }