|
@@ -112,7 +112,8 @@ class Withdraw extends Controller
|
|
|
$count = $query->where($where)->count();
|
|
$count = $query->where($where)->count();
|
|
|
$list = $query->where($where)
|
|
$list = $query->where($where)
|
|
|
->with(['member'])
|
|
->with(['member'])
|
|
|
- ->orderBy('created_at', 'desc')
|
|
|
|
|
|
|
+ ->orderBy('status')
|
|
|
|
|
+ ->orderBy('created_at')
|
|
|
->forpage($page, $limit)->get();
|
|
->forpage($page, $limit)->get();
|
|
|
foreach ($list as &$item) {
|
|
foreach ($list as &$item) {
|
|
|
$item['exchange_rate'] = floatval($item['exchange_rate']);
|
|
$item['exchange_rate'] = floatval($item['exchange_rate']);
|
|
@@ -180,9 +181,9 @@ class Withdraw extends Controller
|
|
|
public function batch()
|
|
public function batch()
|
|
|
{
|
|
{
|
|
|
try {
|
|
try {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
WithdrawService::batchReject();
|
|
WithdrawService::batchReject();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
DB::commit();
|
|
DB::commit();
|
|
|
} catch (ValidationException $e) {
|
|
} catch (ValidationException $e) {
|
|
|
DB::rollBack();
|
|
DB::rollBack();
|
Ken