Merge branch 'rch' into raccount

helper/refill/api/xyz/guochuang/config.php

@@ -95,7 +95,7 @@ class config
         "5-20-23" => 20.08, "5-30-23" => 30.12, "5-50-23" => 50.2, "5-100-23" => 100.4, "5-200-23" => 200.8, "5-300-23" => 301.2, "5-500-23" => 502,//四川 23
         "5-10-31" => 10.22, "5-20-31" => 20.22, "5-30-31" => 30.24, "5-50-31" => 50.25, "5-100-31" => 100.3, "5-200-31" => 200.4, "5-300-31" => 300.6, "5-500-31" => 501,//新疆 31
         //电信
-        "6-10-27" => 10.01, "6-20-27" => 20.02, "6-30-27" => 30.03, "6-50-27" => 50.05, "6-100-27" => 100.1, "6-200-27" => 200.2, "6-300-27" => 300.3, "6-500-27" => 500.5,//陕西 27
+        "6-10-27" => 10.02, "6-20-27" => 20.04, "6-30-27" => 30.06, "6-50-27" => 50.1, "6-100-27" => 100.2, "6-200-27" => 200.4, "6-300-27" => 300.6, "6-500-27" => 501,//陕西 27
         "6-10-4" => 9.935, "6-20-4" => 19.87, "6-30-4" => 29.805, "6-50-4" => 49.675, "6-100-4" => 99.35, "6-200-4" => 198.7, "6-300-4" => 298.05, "6-500-4" => 496.75,//山西 4
         "6-10-18" => 10.04, "6-20-18" => 20.08, "6-30-18" => 30.12, "6-50-18" => 50.15, "6-100-18" => 100.3, "6-200-18" => 200.6, "6-300-18" => 300.9, "6-500-18" => 501.5,//湖南 18
         "6-10-15" => 10.21, "6-20-15" => 20.22, "6-30-15" => 30.231, "6-50-15" => 50.25, "6-100-15" => 100.3, "6-200-15" => 200.3, "6-300-15" => 300.45, "6-500-15" => 500.75,//山东 15

helper/refill/api/yl/guochuang/config.php

@@ -95,7 +95,7 @@ class config
         "5-20-23" => 20.08, "5-30-23" => 30.12, "5-50-23" => 50.2, "5-100-23" => 100.4, "5-200-23" => 200.8, "5-300-23" => 301.2, "5-500-23" => 502,//四川 23
         "5-10-31" => 10.22, "5-20-31" => 20.22, "5-30-31" => 30.24, "5-50-31" => 50.25, "5-100-31" => 100.3, "5-200-31" => 200.4, "5-300-31" => 300.6, "5-500-31" => 501,//新疆 31
         //电信
-        "6-10-27" => 10.01, "6-20-27" => 20.02, "6-30-27" => 30.03, "6-50-27" => 50.05, "6-100-27" => 100.1, "6-200-27" => 200.2, "6-300-27" => 300.3, "6-500-27" => 500.5,//陕西 27
+        "6-10-27" => 10.02, "6-20-27" => 20.04, "6-30-27" => 30.06, "6-50-27" => 50.1, "6-100-27" => 100.2, "6-200-27" => 200.4, "6-300-27" => 300.6, "6-500-27" => 501,//陕西 27
         "6-10-4" => 9.935, "6-20-4" => 19.87, "6-30-4" => 29.805, "6-50-4" => 49.675, "6-100-4" => 99.35, "6-200-4" => 198.7, "6-300-4" => 298.05, "6-500-4" => 496.75,//山西 4
         "6-10-18" => 10.04, "6-20-18" => 20.08, "6-30-18" => 30.12, "6-50-18" => 50.15, "6-100-18" => 100.3, "6-200-18" => 200.6, "6-300-18" => 300.9, "6-500-18" => 501.5,//湖南 18
         "6-10-15" => 10.21, "6-20-15" => 20.22, "6-30-15" => 30.231, "6-50-15" => 50.25, "6-100-15" => 100.3, "6-200-15" => 200.3, "6-300-15" => 300.45, "6-500-15" => 500.75,//山东 15

helper/refill/api/yl/yuntian/config.php

@@ -11,8 +11,8 @@ class config
     const BALANCE_URL = 'http://47.108.209.201/flow-receiver/api/balance/feecbk';
     const NOTIFY_URL = BASE_SITE_URL . '/mobile/callback/refill_yuntian.php';
 
-    const ACCOUNT = 'ytylqg';
-    const KEY = '2da8b4eaa8e7488194c810cf243d44c8';
+    const ACCOUNT = 'ytnhyzqg';
+    const KEY = '77df0d26915f4894b0b7f4ef28090ff3';
     const operator = [
         mtopcard\ChinaMobileCard  => 'CMCC',
         mtopcard\ChinaUnicomCard  => 'CUCC',

helper/refill/api/yl/yuntian/椰林.txt

@@ -1,7 +1,7 @@
 
-账号:ytylqg
+账号:ytnhyzqg
 
-密钥:2da8b4eaa8e7488194c810cf243d44c8
+密钥:77df0d26915f4894b0b7f4ef28090ff3
 
 
 下单地址

helper/refill/api/yl/yuntian_fs/config.php

@@ -11,8 +11,8 @@ class config
     const BALANCE_URL = 'http://47.108.209.201/flow-receiver/api/balance/feecbk';
     const NOTIFY_URL = BASE_SITE_URL . '/mobile/callback/refill_yuntian_fs.php';
 
-    const ACCOUNT = 'ytylfs';
-    const KEY = '38552603820a48ae9a89a600e9a825b0';
+    const ACCOUNT = 'ytnhyzfs';
+    const KEY = 'e5fff087ab3e4e7cbb6255d6dacb981d';
     const operator = [
         mtopcard\ChinaMobileCard  => 'CMCC',
         mtopcard\ChinaUnicomCard  => 'CUCC',

helper/refill/api/yl/yuntian_fs/椰林.txt

@@ -1,7 +1,7 @@
 
-账号:ytylfs
+账号:ytnhyzfs
 
-密钥:38552603820a48ae9a89a600e9a825b0
+密钥:e5fff087ab3e4e7cbb6255d6dacb981d
 
 
 下单地址

test/TestRefill.php

@@ -3547,14 +3547,16 @@ class TestRefill extends TestCase
     {
 //        $provider = $this->getProvider('yuntian');
 //        $resp = $provider->balance();
-//        $resp = $provider->add(15811535608, 4, 30, ['order_sn' => $this->make_sn(), 'regin_no' => 1]);
+        $provider = $this->getProvider('yuntian_fs');
+//        $resp = $provider->balance();
+        $resp = $provider->add(15811535608, 4, 30, ['order_sn' => $this->make_sn(), 'regin_no' => 1]);
 //        $resp = $provider->query(['order_sn' => '89151688372671258257']);
 
-        $body = '{"status":"019","orderNo":"F2307031624355807256","consumerNo":"89151688372671258257","mobile":"15811535608","voucherNo":"null","account":"ytyzqg","timestamp":"1688372676004","sign":"b9b3e1643052fb4d2162d20311ec140f57790384"}';
-        $params = json_decode($body, true);
-        $provider = $this->getProvider('yuntian','RefillCallBack');
-        $ret = $provider->verify($params);
-        $resp = $provider->notify($params);
+//        $body = '{"status":"019","orderNo":"F2307031624355807256","consumerNo":"89151688372671258257","mobile":"15811535608","voucherNo":"null","account":"ytyzqg","timestamp":"1688372676004","sign":"b9b3e1643052fb4d2162d20311ec140f57790384"}';
+//        $params = json_decode($body, true);
+//        $provider = $this->getProvider('yuntian','RefillCallBack');
+//        $ret = $provider->verify($params);
+//        $resp = $provider->notify($params);
     }
 
     public function testKainuo()