|
|
@@ -861,10 +861,10 @@ class merchantControl extends SystemControl
|
|
|
}
|
|
|
$order_list[$order_id]['diff_time_text'] = $this->elapse_time($diff_time);
|
|
|
$order_list[$order_id]['diff_time'] = $diff_time;
|
|
|
+ $order_list[$order_id]['quality_text'] = $this->quality_format($order_info['quality']);
|
|
|
+ $order_list[$order_id]['org_quality_text'] = $this->quality_format($order_info['org_quality']);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
$provider_list = Model('')->table('refill_provider,store')
|
|
|
->field('refill_provider.*,store.store_name')
|
|
|
->join('inner')
|
|
|
@@ -1249,7 +1249,7 @@ class merchantControl extends SystemControl
|
|
|
$type = $_GET['type'] ?? $_POST['type'];
|
|
|
$form = $_GET['form'] ?? $_POST['form'];
|
|
|
$rkey = $this->speed_key($type, $form);
|
|
|
- $quality = ['common' => 1, 'fast' => 2, 'card' => 3, 'third' => 4, 'slow' => 5 , 'slow6' => 6, 'slow24' => 7];
|
|
|
+ $quality = ['common' => 1, 'fast' => 2, 'card' => 3, 'third' => 4, 'slow' => 5 , 'slow6' => 6, 'slow2' => 7];
|
|
|
if (chksubmit()) {
|
|
|
$pids = $_POST['pid'];
|
|
|
$names = $_POST['name'];
|
|
|
@@ -1418,6 +1418,36 @@ class merchantControl extends SystemControl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ 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);
|
|
|
@@ -1559,6 +1589,7 @@ class merchantControl extends SystemControl
|
|
|
$order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];
|
|
|
$order_list[$order_id]['diff_time_text'] = $this->elapse_time(time() - $order_info['order_time']);
|
|
|
$order_list[$order_id]['diff_time'] = time() - $order_info['order_time'];
|
|
|
+ $order_list[$order_id]['quality_text'] = $this->quality_format($order_info['quality']);
|
|
|
}
|
|
|
$provider_list = Model('')->table('refill_provider,store')
|
|
|
->field('refill_provider.*,store.store_name')
|
