admin update

admin/config/config.ini.php

@@ -1,4 +1,5 @@
 <?php
+require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 defined('InShopNC') or exit('Access Invalid!');
 
 $config['sys_log'] = true;
@@ -34,7 +35,25 @@ $config['server'] = [
     '39.99.250.165' => '主数据库服务器',
     '39.103.201.41' => '备份数据库服务器',
     '39.103.141.163' => '后台服务器',
+];
 
+$config['oil_quality_text'] = [
+    refill\Quality::Normal => '无流水',
+    refill\Quality::Quick => '快充',
+    refill\Quality::CardKey => '卡密',
+    refill\Quality::SlowTwentyFour => '有流水'
+];
+$config['phone_quality_text'] = [
+    refill\Quality::Normal => '普充',
+    refill\Quality::Quick => '快充',
+    refill\Quality::CardKey => '卡密',
+    refill\Quality::ThirdShop => '三方',
+    refill\Quality::SlowTwentyFour => '慢24',
+    refill\Quality::SlowSix => '慢6',
+    refill\Quality::SlowTwo => '慢2',
+    refill\Quality::SlowFortyEight => '慢48',
+    refill\Quality::SlowSeventyTwo => '慢72',
+    refill\Quality::Fastest => '速充',
 ];
 
 return $config;

admin/control/control.php

@@ -332,30 +332,13 @@ class SystemControl
     }
 
     protected function quality_format($quality,$card_type) {
-        $oil_text = [
-            refill\Quality::Normal => '无流水',
-            refill\Quality::Quick => '快充',
-            refill\Quality::CardKey => '卡密',
-            refill\Quality::SlowTwentyFour => '有流水'
-        ];
-        $phone_text = [
-            refill\Quality::Normal => '普充',
-            refill\Quality::Quick => '快充',
-            refill\Quality::CardKey => '卡密',
-            refill\Quality::ThirdShop => '三方',
-            refill\Quality::SlowTwentyFour => '慢24',
-            refill\Quality::SlowSix => '慢6',
-            refill\Quality::SlowTwo => '慢2',
-            refill\Quality::SlowFortyEight => '慢48',
-            refill\Quality::SlowSeventyTwo => '慢72',
-            refill\Quality::Fastest => '速充',
-        ];
+        global $config;
         $text = [
-            mtopcard\PetroChinaCard => $oil_text,
-            mtopcard\SinopecCard => $oil_text,
-            mtopcard\ChinaMobileCard => $phone_text,
-            mtopcard\ChinaUnicomCard => $phone_text,
-            mtopcard\ChinaTelecomCard => $phone_text
+            mtopcard\PetroChinaCard => $config['oil_quality_text'],
+            mtopcard\SinopecCard => $config['oil_quality_text'],
+            mtopcard\ChinaMobileCard => $config['phone_quality_text'],
+            mtopcard\ChinaUnicomCard => $config['phone_quality_text'],
+            mtopcard\ChinaTelecomCard => $config['phone_quality_text']
         ];
         return $text[$card_type][$quality] ?? $quality;
     }

admin/control/provider.php

@@ -13,6 +13,7 @@ class providerControl extends SystemControl
 
     public function indexOp()
     {
+        global $config;
         $this->sync_cfgs();
         $provider_model = Model('refill_provider');
         $condition = [];
@@ -44,6 +45,8 @@ class providerControl extends SystemControl
             $pid = $provider['provider_id'];
             $providers[$pid] = $provider;
             $providers[$pid]['available_predeposit'] = 0;
+            $quality_text = $provider['type'] == mtopcard\OilCardPaper ? $config['oil_quality_text'] : $config['phone_quality_text'];
+            $providers[$pid]['quality_text'] = $quality_text[$provider['qualitys']];
             $account_id = intval($provider['account_id']);
             if($account_id > 0) {
                 $mid_pids[$account_id] = $pid;

admin/templates/default/provider.index.php

@@ -124,6 +124,7 @@
                     <th>店铺ID</th>
                     <th>会员ID</th>
                     <th>通道类型</th>
+                    <th>通道质量</th>
                     <th class="align-center">通道状态</th>
                     <th>调款操作</th>
                     <th class="align-right">订单成功后余额</th>
@@ -141,7 +142,7 @@
                             <td><?php echo $v['store_id']; ?></td>
                             <td><?php echo $v['account_id']; ?></td>
                             <td><?php echo $output['type_text'][$v['type'] - 1]; ?></td>
-
+                            <td><?php echo $v['quality_text']; ?></td>
                             <td class="align-center">
                                 <?php if ($v['opened'] == 1) { ?>
                                     <span style="color: #0bb20c">

data/config/win/refill.ini.php

@@ -276,71 +276,39 @@ $bjb_phone = ['name' => 'bjb', 'store_id' => 12,'qualitys' => '1',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$lingzh_phone = ['name' => 'lingzh', 'store_id' => 28,'qualitys' => '1,3,4,5,6',
+$lingzh_phone = ['name' => 'lingzh', 'store_id' => 28,'qualitys' => '1',
     'amount' => [
         10 => [
             ['goods_id' => 6389, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6389, 'price' => 9.51, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6389, 'price' => 9.53, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6389, 'price' => 8.95, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6389, 'price' => 8.99, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6389, 'price' => 8.99, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
         ],
         20 => [
             ['goods_id' => 6390, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6390, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6390, 'price' => 19.06, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6390, 'price' => 17.9, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6390, 'price' => 17.98, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6390, 'price' => 17.98, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         30 => [
             ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6391, 'price' => 28.59, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6391, 'price' => 26.85, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6391, 'price' => 26.97, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6391, 'price' => 26.97, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         50 => [
             ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6392, 'price' => 47.65, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6392, 'price' => 44.75, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6392, 'price' => 44.95, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6392, 'price' => 44.95, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         100 => [
             ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6393, 'price' => 95.3, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6393, 'price' => 89.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6393, 'price' => 89.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6393, 'price' => 89.9, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         200 => [
             ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6394, 'price' => 190.60, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6394, 'price' => 179, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6394, 'price' => 179.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6394, 'price' => 179.8, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         300 => [
             ['goods_id' => 6395, 'price' => 285.90, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6395, 'price' => 285.30, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6395, 'price' => 285.90, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6395, 'price' => 268.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6395, 'price' => 269.7, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6395, 'price' => 269.7, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         500 => [
             ['goods_id' => 6396, 'price' => 476.50, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6396, 'price' => 475.50, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
-            ['goods_id' => 6396, 'price' => 476.50, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6396, 'price' => 447.5,  'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6396, 'price' => 449.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
-            ['goods_id' => 6396, 'price' => 449.5, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];