|
|
@ -245,7 +245,7 @@ class AccountController extends AbstractController
|
|
|
|
$query->where('last_card_no', $request->input('bankCardNo'));
|
|
|
|
$query->where('last_card_no', $request->input('bankCardNo'));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!empty($request->input('cardUserName'))) {
|
|
|
|
if (!empty($request->input('cardUserName'))) {
|
|
|
|
$query->where('card_user_name', 'like', Db::raw('%' . $request->input('cardUserName')));
|
|
|
|
$query->where('card_user_name', 'like', '%' . $request->input('cardUserName'));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$status = $request->input('status');
|
|
|
|
$status = $request->input('status');
|
|
|
|
if (!empty($status)) {
|
|
|
|
if (!empty($status)) {
|
|
|
@ -296,7 +296,7 @@ class AccountController extends AbstractController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$records[] = [
|
|
|
|
$records[] = [
|
|
|
|
'out_order_no' => $order->out_order_no,
|
|
|
|
'out_order_no' => $order->out_order_no,
|
|
|
|
'created_at' => $order->created_at,
|
|
|
|
'created_at' => $order->created_at->format('Y-m-d H:i:s'),
|
|
|
|
'status' => $order->status,
|
|
|
|
'status' => $order->status,
|
|
|
|
'amount' => number_format($order->amount / 100, 2, '.', ''),
|
|
|
|
'amount' => number_format($order->amount / 100, 2, '.', ''),
|
|
|
|
'card_user_name' => $order->card_user_name,
|
|
|
|
'card_user_name' => $order->card_user_name,
|
|
|
|