export bug

admin/control/ordersendlist.php

@@ -351,20 +351,18 @@ class ordersendlistControl extends SystemControl
         $orders = [];
         while (true) {
             $start = $i * $len;
-            $order_list = Model('')->table('refill_order,vr_order,merchant')
+            $items = Model('')->table('refill_order,vr_order,merchant')
                 ->field('refill_order.*,vr_order.order_state')
                 ->join('inner,inner')
                 ->on('refill_order.order_id=vr_order.order_id,refill_order.mchid=merchant.mchid')
                 ->where($condition)
                 ->order('refill_order.order_time desc')
                 ->limit("{$start},{$len}")->select();
+            $orders = array_merge($orders,$items);
             if (empty($items) || count($items) < $len) {
                 break;
             }
             $i++;
-            foreach ($order_list as $order) {
-                $orders[] = $order;
-            }
         }
         return $orders;
     }

admin/control/refill_order.php

@@ -471,12 +471,11 @@ class refill_orderControl extends SystemControl
                                         ->order('refill_order.order_time desc')
                                         ->limit("{$start},{$len}")
                                         ->select();
+            $orders = array_merge($orders,$items);
             if (empty($items) || count($items) < $len) {
                 break;
             }
-
             $i++;
-            $orders = array_merge($orders,$items);
         }
         return $orders;
     }