for mchsrv

mchsrv/control/merchant_order.php

@@ -72,21 +72,27 @@ class merchant_orderControl extends mbMerchantControl
         $cond['refill_order.order_time'] = [['egt', $start], ['lt', $end], 'and'];
         $cond['vr_order.add_time'] = [['egt', $start], ['elt', $add_end], 'and'];
 
-        if (in_array($_GET['order_state'], array('0', '30', '40'))) {
+        if (in_array($_GET['order_state'], ['0', '30', '40']))
+        {
             $cond['vr_order.order_state'] = $_GET['order_state'];
-            if($_GET['order_state'] == 30 && $_GET['time'] == 1){
+            if ($_GET['order_state'] == 30 && $_GET['time'] == 1) {
                 $cond['refill_order.order_time'] = ['lt', (time() - 3600)];
             }
         }
 
         $fields = 'refill_order.*,vr_order.order_state';
-        $order_list = $model_vr_order->getMerchantOrderList($cond, $this->page, 5000, $fields, 'refill_order.order_time desc');
+        $order_list = $model_vr_order->getMerchantOrderList($cond, $this->page, 0, $fields, 'refill_order.order_time desc');
         $order_list = $this->merchant_order_format($order_list);
         $result['data'] = $order_list;
         $result['total'] = $model_vr_order->gettotalpage();
         return self::outsuccess($result);
     }
 
+    private function getTotal()
+    {
+
+    }
+
     public function OrderStatsOp()
     {
         if(empty($_GET['time_type']) || empty($_GET['start_time']) || empty($_GET['end_time'])) {