|
|
|
@ -231,7 +231,7 @@ class AccountController extends AbstractController
|
|
|
|
|
{
|
|
|
|
|
$userInfo = $this->checkUser($request);
|
|
|
|
|
$userId = $this->resetUserId($userInfo['userId']);
|
|
|
|
|
$query = Order::query()->with('user');
|
|
|
|
|
$query = Order::query()->with('user')->where('is_account_pay', 1);
|
|
|
|
|
if ($userId != 'ACT_5') {
|
|
|
|
|
$query->where('user_id', $userId);
|
|
|
|
|
}
|
|
|
|
@ -309,6 +309,6 @@ class AccountController extends AbstractController
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return $this->success(['records' => $records, 'total' => $total, 'amount' => $amount]);
|
|
|
|
|
return $this->success(['records' => $records, 'total' => $total, 'amount' => number_format($amount / 100, 2, '.', '')]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|