admin refill order time where update

admin/control/merchant.php

@@ -31,7 +31,7 @@ class merchantControl extends SystemControl
             Tpl::output('merchant_name', $_GET['merchant_name']);
         }
 
-        $merchant_list = $model_merchant->getMerchantList($condition, 25, 'mchid desc');
+        $merchant_list = $model_merchant->getMerchantList($condition, 25, 'available_predeposit desc');
 
         $merchant_state_text = ['使用中', '已禁用'];
         Tpl::output('merchant_state_text', $merchant_state_text);
@@ -677,9 +677,7 @@ class merchantControl extends SystemControl
         if (!empty($_GET['card_no'])) {
             $condition['refill_order.card_no'] = $_GET['card_no'];
         }
-        if(empty($condition)) {
-            $condition['refill_order.order_time'] = ['time', [strtotime(date("Y-m-d")), strtotime(date("Y-m-d"))]];
-        }
+        $condition['refill_order.order_time'] = ['time', [strtotime(date("Y-m-d")), strtotime(date("Y-m-d"))]];
         $condition['refill_order.inner_status'] = 0;
         if (!empty($_GET['card_type'])) {
             if(in_array($_GET['card_type'] , ['1' , '2' , '4' , '5' , '6'])) {