admin control update

admin/control/control.php

@@ -309,4 +309,73 @@ class SystemControl
 	        $model_cron->addCron($data);
 	    }
 	}
+
+    protected function scard_type(int $card_type)
+    {
+        if ($card_type == 1) { //中石油
+            return '中石油';
+        } elseif ($card_type == 2) { //中石化
+            return '中石化';
+        } elseif ($card_type == 4) { //中国移动
+            return '中国移动';
+        } elseif ($card_type == 5) { //中国联通
+            return '中国联通';
+        } elseif ($card_type == 6) { //中国电信
+            return '中国电信';
+        } elseif ($card_type == 7) { //中国电信
+            return '增值业务';
+        } else {
+            return 'unknown';
+        }
+    }
+
+    protected function quality_format($quality) {
+        switch ($quality) {
+            case 1:
+                $text = "普充";
+                break;
+            case 2:
+                $text = "快充";
+                break;
+            case 3:
+                $text = "卡密";
+                break;
+            case 4:
+                $text = "三方";
+                break;
+            case 5:
+                $text = "慢充二十四小时";
+                break;
+            case 6:
+                $text = "慢充六小时";
+                break;
+            case 7:
+                $text = "慢充两小时";
+                break;
+            default:
+                return '其他';
+                break;
+        }
+        return $text;
+    }
+
+    protected function elapse_time($seconds)
+    {
+        $minutes = intval($seconds / 60);
+        $second = intval($seconds % 60);
+        if ($minutes >= 60) {
+            $minute = $minutes % 60;
+            $hours = intval($minutes / 60);
+            $result = "{$minute}m{$second}s";
+        } elseif ($minutes > 0) {
+            $result = "{$minutes}m{$second}s";
+        } else {
+            $result = "{$second}s";
+        }
+
+        if (isset($hours)) {
+            $result = "{$hours}h{$minute}m";
+        }
+        return $result;
+    }
 }

admin/control/merchant.php

@@ -1005,7 +1005,7 @@ class merchantControl extends SystemControl
                 ->on('store.store_id=refill_provider.store_id')
                 ->where(['type' => $type, 'qualitys' => ['like', '%' . $quality[$form] . '%']])
                 ->limit(1000)
-                ->order('opened asc , provider_id desc')
+                ->order('opened asc , sort desc')
                 ->select();
             if (empty($providers)) {
                 showMessage('暂无相关通道', 'index.php?act=provider&op=index');
@@ -1107,73 +1107,6 @@ class merchantControl extends SystemControl
         return ['amountData' => $amountData, 'form' => $form, 'amounts' => $amounts, 'types' => $type_data, 'cfgs' => $pcfgs];
     }
 
-    private function scard_type(int $card_type)
-    {
-        if ($card_type == 1) { //中石油
-            return '中石油';
-        } elseif ($card_type == 2) { //中石化
-            return '中石化';
-        } elseif ($card_type == 4) { //中国移动
-            return '中国移动';
-        } elseif ($card_type == 5) { //中国联通
-            return '中国联通';
-        } elseif ($card_type == 6) { //中国电信
-            return '中国电信';
-        } else {
-            return 'unknown';
-        }
-    }
-
-    private function quality_format($quality) {
-        switch ($quality) {
-            case 1:
-                $text = "普充";
-                break;
-            case 2:
-                $text = "快充";
-                break;
-            case 3:
-                $text = "卡密";
-                break;
-            case 4:
-                $text = "三方";
-                break;
-            case 5:
-                $text = "慢充二十四小时";
-                break;
-            case 6:
-                $text = "慢充六小时";
-                break;
-            case 7:
-                $text = "慢充两小时";
-                break;
-            default:
-                return '其他';
-                break;
-        }
-        return $text;
-    }
-
-    private function elapse_time($seconds)
-    {
-        $minutes = intval($seconds / 60);
-        $second = intval($seconds % 60);
-        if ($minutes >= 60) {
-            $minute = $minutes % 60;
-            $hours = intval($minutes / 60);
-            $result = "{$minute}m{$second}s";
-        } elseif ($minutes > 0) {
-            $result = "{$minutes}m{$second}s";
-        } else {
-            $result = "{$second}s";
-        }
-
-        if (isset($hours)) {
-            $result = "{$hours}h{$minute}m";
-        }
-        return $result;
-    }
-
     public function OrderStatsCheckOp()
     {
         $stat_id = $_GET['stat_id'] ?? $_POST['stat_id'];

admin/control/refill_order.php

@@ -211,75 +211,6 @@ class refill_orderControl extends SystemControl
         exit;
     }
 
-    private function scard_type(int $card_type)
-    {
-        if ($card_type == 1) { //中石油
-            return '中石油';
-        } elseif ($card_type == 2) { //中石化
-            return '中石化';
-        } elseif ($card_type == 4) { //中国移动
-            return '中国移动';
-        } elseif ($card_type == 5) { //中国联通
-            return '中国联通';
-        } elseif ($card_type == 6) { //中国电信
-            return '中国电信';
-        } elseif ($card_type == 7) { //中国电信
-            return '增值业务';
-        } else {
-            return 'unknown';
-        }
-    }
-
-    private function quality_format($quality) {
-        switch ($quality) {
-            case 1:
-                $text = "普充";
-                break;
-            case 2:
-                $text = "快充";
-                break;
-            case 3:
-                $text = "卡密";
-                break;
-            case 4:
-                $text = "三方";
-                break;
-            case 5:
-                $text = "慢充二十四小时";
-                break;
-            case 6:
-                $text = "慢充六小时";
-                break;
-            case 7:
-                $text = "慢充两小时";
-                break;
-            default:
-                return '其他';
-                break;
-        }
-        return $text;
-    }
-
-    private function elapse_time($seconds)
-    {
-        $minutes = intval($seconds / 60);
-        $second = intval($seconds % 60);
-        if ($minutes >= 60) {
-            $minute = $minutes % 60;
-            $hours = intval($minutes / 60);
-            $result = "{$minute}m{$second}s";
-        } elseif ($minutes > 0) {
-            $result = "{$minutes}m{$second}s";
-        } else {
-            $result = "{$second}s";
-        }
-
-        if (isset($hours)) {
-            $result = "{$hours}h{$minute}m";
-        }
-        return $result;
-    }
-
     private function all_order_state_stat($condition)
     {
         $counts = Model('')->table('refill_order,vr_order')->join('inner')

admin/control/refill_order_manual.php

@@ -0,0 +1,7 @@
+<?php
+
+
+class refill_order_manual
+{
+
+}