diff --git a/app/Http/Controllers/Module/UserController.php b/app/Http/Controllers/Module/UserController.php index 8af4fff..a760180 100644 --- a/app/Http/Controllers/Module/UserController.php +++ b/app/Http/Controllers/Module/UserController.php @@ -24,15 +24,15 @@ public function index(Request $request): JsonResponse // 搜索 name, email, balance if ($request->has('name')) { - $users->where('name', 'like', '%' . $request->input('name') . '%'); + $users->where('name', 'like', '%'.$request->input('name').'%'); } if ($request->has('email')) { - $users->where('email', 'like', '%' . $request->input('email') . '%'); + $users->where('email', 'like', '%'.$request->input('email').'%'); } if ($request->has('balance')) { - $users->where('balance', 'like', '%' . $request->input('balance') . '%'); + $users->where('balance', 'like', '%'.$request->input('balance').'%'); } $users = $users->simplePaginate(100); @@ -89,7 +89,7 @@ public function update(Request $request, User $user): JsonResponse } $trans = $user->reduce($balance, $request->description, true, [ - 'module_id' => $module->id + 'module_id' => $module->id, ]); $module->charge($balance, 'balance', $request->description, [ 'user_id' => $user->id, @@ -104,7 +104,7 @@ public function update(Request $request, User $user): JsonResponse 'payment' => 'module_balance', ]); $trans = $user->charge($balance, 'module_balance', $request->description, [ - 'module_id' => $module->id + 'module_id' => $module->id, ]); } diff --git a/app/Http/Controllers/Web/MaintenanceController.php b/app/Http/Controllers/Web/MaintenanceController.php index 68234fc..cfdc37a 100644 --- a/app/Http/Controllers/Web/MaintenanceController.php +++ b/app/Http/Controllers/Web/MaintenanceController.php @@ -4,7 +4,6 @@ use App\Http\Controllers\Controller; use App\Models\Maintenance; -use Illuminate\Http\JsonResponse; use Illuminate\View\View; class MaintenanceController extends Controller diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 45ed445..6c116fc 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -4,7 +4,6 @@ use Carbon\Carbon; use Jenssegers\Mongodb\Eloquent\Model; -use Symfony\Component\Uid\Ulid; class Transaction extends Model { diff --git a/app/Models/User.php b/app/Models/User.php index a5619f5..c5e56ce 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -166,11 +166,10 @@ public function startTransfer(self $to, string $amount, string|null $description /** * 扣除费用 * - * @param string|null $amount - * @param string $description - * @param bool $fail - * @param array $options - * + * @param string|null $amount + * @param string $description + * @param bool $fail + * @param array $options * @return Transaction */ public function reduce(string|null $amount = '0', string $description = '消费', bool $fail = false, array $options = []): Transaction @@ -212,11 +211,10 @@ public function reduce(string|null $amount = '0', string $description = '消费' /** * 增加余额 * - * @param string|null $amount - * @param string $payment - * @param string $description - * @param array $options - * + * @param string|null $amount + * @param string $payment + * @param string $description + * @param array $options * @return Transaction */ public function charge(string|null $amount = '0', string $payment = 'console', string $description = '充值', array $options = []): Transaction