Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

data/config/xyz/refill.ini.php

@@ -123,7 +123,7 @@ $zeheng_oil = ['name' => 'zeheng', 'store_id' => 51,'qualitys' => '1',
     ],
     'period' => [], 'refill_type' => 'api'];
 
-$lingzhu_oil = ['name' => 'lingzhuoil', 'store_id' => 56, 'qualitys' => '1',
+$lingzh_oil = ['name' => 'lingzhoil', 'store_id' => 56, 'qualitys' => '1',
     'amount' => [
         100 => [['goods_id' => 6579, 'price' => 96.9, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
         200 => [['goods_id' => 6580, 'price' => 193.8, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
@@ -145,7 +145,7 @@ $oil_providers = [
     ['name' => 'yichangt', 'cfg' => $yichangt_oil],
     ['name' => 'jumi', 'cfg' => $jumi_oil],
     ['name' => 'zeheng', 'cfg' => $zeheng_oil],
-    ['name' => 'lingzhuoil', 'cfg' => $lingzhu_oil]
+    ['name' => 'lingzhoil', 'cfg' => $lingzh_oil]
 ];
 $config['oil_providers'] = $oil_providers;
 

helper/refill/api/xyz/lingzhoil/RefillPhone.php

@@ -6,7 +6,7 @@ require_once(BASE_HELPER_RAPI_PATH . '/lingzhoil/config.php');
 use refill;
 use Log;
 
-class RefillPhone extends refill\IRefillPhone
+class RefillOil extends refill\IRefillPhone
 {
     public function __construct($cfgs)
     {

helper/refill/policy/chctl.php

@@ -19,6 +19,8 @@ class chctl
         ['quality'=> 3,'name' => 'channel-ctl-phone-card-limit'],
         ['quality'=> 4,'name' => 'channel-ctl-phone-third-limit'],
         ['quality'=> 5,'name' => 'channel-ctl-phone-slow-limit'],
+        ['quality'=> 6,'name' => 'channel-ctl-phone-slow6-limit'],
+        ['quality'=> 7,'name' => 'channel-ctl-phone-slow2-limit'],
     ];
 
     public function __construct()