admin update

admin/control/orderstats.php

@@ -31,15 +31,7 @@ class orderstatsControl extends SystemControl
         }
 
         $stats_list = $model_refill_order->getOrderStatsList($condition, 50, '*', 'time_stamp desc, cname asc');
-
-        if ($type == 'provider') {
-            $provider_list = Model('')->table('refill_provider,store')->field('refill_provider.store_id,store.store_name')->join('inner')
-                ->on('store.store_id=refill_provider.store_id')->limit(1000)->order('name asc')->select();
-            Tpl::output('provider_list', $provider_list);
-        } elseif ($type == 'merchant') {
-            $merchant_list = Model('')->table('merchant')->limit(1000)->select();
-            Tpl::output('merchant_list', $merchant_list);
-        }
+        
         $total_stats = $this->stats($stats_list);
         $order_time_type_text = ['notify_time' => '回调时间', 'order_time' => '下单时间'];
         Tpl::output('total_stats', $total_stats);

admin/control/refill_order.php

@@ -276,7 +276,7 @@ class refill_orderControl extends SystemControl
             ->field('refill_provider.*,store.store_name')
             ->join('inner')
             ->on('store.store_id=refill_provider.store_id')
-            ->order('opened asc, name asc')
+            ->order('name asc')
             ->limit(1000)
             ->select();
         foreach ($provider_list as $value) {