|
@@ -52,6 +52,7 @@ class Withdraw extends Controller
|
|
|
'id' => ['nullable', 'integer', 'min:1'],
|
|
'id' => ['nullable', 'integer', 'min:1'],
|
|
|
'type' => ['nullable', 'integer'],
|
|
'type' => ['nullable', 'integer'],
|
|
|
'member_id' => ['nullable', 'string', 'min:1'],
|
|
'member_id' => ['nullable', 'string', 'min:1'],
|
|
|
|
|
+ 'account' => ['nullable', 'string', 'max:64'],
|
|
|
'status' => ['nullable', 'integer'],
|
|
'status' => ['nullable', 'integer'],
|
|
|
'first_name' => ['nullable'],
|
|
'first_name' => ['nullable'],
|
|
|
]);
|
|
]);
|
|
@@ -60,7 +61,7 @@ class Withdraw extends Controller
|
|
|
$params['type'] = $params['type'] ?? 2;
|
|
$params['type'] = $params['type'] ?? 2;
|
|
|
|
|
|
|
|
$query = PaymentOrder::join('users', 'users.member_id', '=', 'payment_orders.member_id')
|
|
$query = PaymentOrder::join('users', 'users.member_id', '=', 'payment_orders.member_id')
|
|
|
- ->select("payment_orders.*", "users.first_name","users.admin_note as user_admin_note");
|
|
|
|
|
|
|
+ ->select("payment_orders.*", "users.first_name", "users.account", "users.admin_note as user_admin_note");
|
|
|
|
|
|
|
|
$where = PaymentOrderService::getWhere($params);
|
|
$where = PaymentOrderService::getWhere($params);
|
|
|
$count = $query->where($where)->count();
|
|
$count = $query->where($where)->count();
|
|
@@ -121,13 +122,14 @@ class Withdraw extends Controller
|
|
|
'limit' => ['nullable', 'integer', 'min:1'],
|
|
'limit' => ['nullable', 'integer', 'min:1'],
|
|
|
'id' => ['nullable', 'integer', 'min:1'],
|
|
'id' => ['nullable', 'integer', 'min:1'],
|
|
|
'member_id' => ['nullable', 'string', 'min:1'],
|
|
'member_id' => ['nullable', 'string', 'min:1'],
|
|
|
|
|
+ 'account' => ['nullable', 'string', 'max:64'],
|
|
|
'status' => ['nullable', 'integer'],
|
|
'status' => ['nullable', 'integer'],
|
|
|
'first_name' => ['nullable'],
|
|
'first_name' => ['nullable'],
|
|
|
]);
|
|
]);
|
|
|
$page = request()->input('page', 1);
|
|
$page = request()->input('page', 1);
|
|
|
$limit = request()->input('limit', 10);
|
|
$limit = request()->input('limit', 10);
|
|
|
$query = WithdrawModel::join('users', 'users.member_id', '=', 'withdraws.member_id')
|
|
$query = WithdrawModel::join('users', 'users.member_id', '=', 'withdraws.member_id')
|
|
|
- ->select("withdraws.*", "users.first_name","users.admin_note as user_admin_note");
|
|
|
|
|
|
|
+ ->select("withdraws.*", "users.first_name", "users.account", "users.admin_note as user_admin_note");
|
|
|
$where = WithdrawService::getWhere($params);
|
|
$where = WithdrawService::getWhere($params);
|
|
|
$count = $query->where($where)->count();
|
|
$count = $query->where($where)->count();
|
|
|
$list = $query->where($where)
|
|
$list = $query->where($where)
|