diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 17cf21e..d96f058 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -164,7 +164,7 @@ private function addLog($user_id, $data) $user = User::find($user_id); $current = [ - 'balances' => $user->balance, + 'balance' => $user->balance, 'drops' => $this->getDrops($user_id), 'user_id' => intval($user_id), ]; @@ -198,7 +198,7 @@ public function getDrops($user_id = null): float return $drops['drops']; } - public function addIncomeDrops($user_id, $amount, $description, $payment = 'balances') + public function addIncomeDrops($user_id, $amount, $description, $payment = 'balance') { $data = [ 'type' => 'income', @@ -232,8 +232,6 @@ public function reduceAmount($user_id, $amount = 0, $description = '扣除费用 } finally { optional($lock)->release(); } - - return false; } public function addPayoutBalance($user_id, $amount, $description, $module_id = null) @@ -280,8 +278,6 @@ public function reduceAmountModuleFail($user_id, $module_id, $amount = 0, $descr } finally { optional($lock)->release(); } - - return false; } public function reduceHostAmount($user_id, $host_id, $module_id, $amount = 0, $description = '扣除费用请求。') @@ -303,15 +299,13 @@ public function reduceHostAmount($user_id, $host_id, $module_id, $amount = 0, $d } finally { optional($lock)->release(); } - - return false; } public function addHostPayoutBalance($user_id, $host_id, $module_id, $amount, $description) { $data = [ 'type' => 'payout', - 'payment' => 'balances', + 'payment' => 'balance', 'description' => $description, 'income' => 0, 'income_drops' => 0, @@ -355,8 +349,6 @@ public function addAmount($user_id, $payment = 'console', $amount = 0, $descript } finally { optional($lock)->release(); } - - return false; } public function addIncomeBalance($user_id, $payment, $amount, $description) diff --git a/resources/views/balances/transactions.blade.php b/resources/views/balances/transactions.blade.php index a68c878..e1a644e 100644 --- a/resources/views/balances/transactions.blade.php +++ b/resources/views/balances/transactions.blade.php @@ -55,7 +55,7 @@ - {{ $t->balances }} 元 + {{ $t->balance }} 元
{{ $t->drops }} Drops