|
@@ -18,7 +18,7 @@ class WalletService
|
|
|
*
|
|
|
* @param int $userId 用户ID
|
|
|
* @param int $perPage 每页记录数
|
|
|
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
|
|
|
+ * @return array 包含 items 和 total 的数组
|
|
|
*
|
|
|
* @throws \Exception
|
|
|
*/
|
|
@@ -34,11 +34,15 @@ class WalletService
|
|
|
abort_if($user->state != UserStatus::OPEN->value, 400, '用户状态异常');
|
|
|
|
|
|
// 获取钱包交易记录
|
|
|
- $records = $user->wallet->transRecords()
|
|
|
+ $paginator = $user->wallet->transRecords()
|
|
|
->orderBy('created_at', 'desc')
|
|
|
->paginate($perPage);
|
|
|
|
|
|
- return $records;
|
|
|
+ // 转换为统一的分页格式
|
|
|
+ return [
|
|
|
+ 'items' => $paginator->items(),
|
|
|
+ 'total' => $paginator->total(),
|
|
|
+ ];
|
|
|
} catch (\Exception $e) {
|
|
|
// 记录错误日志
|
|
|
\Log::error('获取钱包明细失败', [
|
|
@@ -103,7 +107,7 @@ class WalletService
|
|
|
abort_if($amount > $wallet->available_balance, 422, '可提现余额不足');
|
|
|
|
|
|
// 生成交易流水号
|
|
|
- $transNo = 'CW' . date('YmdHis') . mt_rand(1000, 9999);
|
|
|
+ $transNo = 'CW'.date('YmdHis').mt_rand(1000, 9999);
|
|
|
|
|
|
// 创建提现记录
|
|
|
$withdraw = WalletWithdrawRecord::create([
|