HARUHARU 4 лет назад
Родитель
Сommit
7e3289491f

+ 2 - 2
data/config/prod/refill.ini.php

@@ -13,7 +13,7 @@ $config['refill_specs'] = [
 //充值渠道配置表
 
 //速汇充京东加油通道
-$suhc_oil = ['name' => 'suhc', 'store_id' => 7, 'card_type' => ['sinopec'],
+$tianjt_oil = ['name' => 'tianjt', 'store_id' => 7, 'card_type' => ['sinopec'],
     'amount' => [100 => ['goods_id' => 6290, 'price' => 97.0],
         200 => ['goods_id' => 6291, 'price' => 194],
         500 => ['goods_id' => 6292, 'price' => 485],
@@ -82,7 +82,7 @@ $gftdsinop_oil = ['name' => 'gftdsinop', 'store_id' => 20, 'card_type' => ['sino
     'period' => [], 'refill_type' => 'api'];
 
 $oil_providers = [
-    ['name' => 'suhc', 'cfg' => $suhc_oil, 'opened' => false, 'sort' => 3],
+    ['name' => 'tianjt', 'cfg' => $tianjt_oil, 'opened' => false, 'sort' => 3],
     ['name' => 'suhctm', 'cfg' => $suhctm_oil, 'opened' => false, 'sort' => 1],
     ['name' => 'suhcpdd', 'cfg' => $suhcpdd_oil, 'opened' => false, 'sort' => 2],
     ['name' => 'zzx', 'cfg' => $zzx_oil, 'opened' => false, 'sort' => 5],

+ 1 - 1
helper/fcgi_server.php

@@ -28,7 +28,7 @@ class fcgi_server
             'wxnotify.php','pub_wxnotify.php','alipay_notify_url.php','dispatch_notify.php','kdniao_notify.php',
             'cmbpay_notify.php','cmbpay_sign.php','wxauthor.php','api/wxLogin/index.php','api/wxLogin/callback.php',
             'signature.php',
-            'refill_suhc.php','refill_suhctm.php','refill_suhcpdd.php','refill_gftd.php',
+            'refill_tianjt.php','refill_suhctm.php','refill_suhcpdd.php','refill_gftd.php',
             'refill_beixt.php','refill_bxtwt.php','refill_bjb.php','refill_xyz.php',
             'refill_zzx.php','refill_inner.php','refill_jiec.php','refill_yifa.php',
             'bridge_shr.php','refill_weit.php'

+ 3 - 3
helper/refill/RefillFactory.php

@@ -14,9 +14,9 @@ require_once(BASE_HELPER_PATH . '/refill/CalcMerchantPrice.php');
 require_once(BASE_HELPER_PATH . '/refill/util.php');
 
 
-require_once(BASE_HELPER_PATH . '/refill/suhc/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/suhc/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/suhc/RefillCallBack.php');
+require_once(BASE_HELPER_PATH . '/refill/tianjt/RefillOil.php');
+require_once(BASE_HELPER_PATH . '/refill/tianjt/RefillPhone.php');
+require_once(BASE_HELPER_PATH . '/refill/tianjt/RefillCallBack.php');
 
 require_once(BASE_HELPER_PATH . '/refill/suhctm/RefillOil.php');
 require_once(BASE_HELPER_PATH . '/refill/suhctm/RefillPhone.php');

+ 1 - 1
helper/refill/suhc/RefillCallBack.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace refill\suhc;
+namespace refill\tianjt;
 
 use refill;
 

+ 2 - 2
helper/refill/suhc/RefillOil.php

@@ -1,9 +1,9 @@
 <?php
 
 
-namespace refill\suhc;
+namespace refill\tianjt;
 
-require_once(BASE_HELPER_PATH . '/refill/suhc/config.php');
+require_once(BASE_HELPER_PATH . '/refill/tianjt/config.php');
 
 
 use refill;

+ 1 - 1
helper/refill/suhc/RefillPhone.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace refill\suhc;
+namespace refill\tianjt;
 
 
 use refill\IRefillPhone;

+ 6 - 6
helper/refill/suhc/config.php

@@ -1,16 +1,16 @@
 <?php
 
 
-namespace refill\suhc;
+namespace refill\tianjt;
 
 
 class config
 {
-    const ORDER_URL = 'http://jiayouka.5800cc.com/order/createOrder.html';
-    const ORDER_QUERY_URL = 'http://jiayouka.5800cc.com/order/queryOrder.html';
-    const KEY = '7yDCLS6S2KzSAJQOUc3vsa';
-    const ORGID = 1590993600;
-    const NOTIFY_URL = BASE_SITE_URL . "/mobile/refill_suhc.php";
+    const ORDER_URL = 'http://oilcard.lwyuja.cn/order/createOrder.html';
+    const ORDER_QUERY_URL = 'http://oilcard.lwyuja.cn/order/queryOrder.html';
+    const KEY = '0TKtWOgpaLc5CQ0KvewK5J';
+    const ORGID = 7532391600;
+    const NOTIFY_URL = BASE_SITE_URL . "/mobile/refill_tianjt.php";
     const STOREIDS = ['10280838',
         '611127',
         '10109062',

+ 1 - 1
mobile/refill_suhc.php

@@ -2,7 +2,7 @@
 
 require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 
-refill\RefillFactory::instance()->notify('suhc',$_POST);
+refill\RefillFactory::instance()->notify('tianjt',$_POST);
 
 echo ('SUCCESS');
 

+ 11 - 11
test/TestRefill.php

@@ -107,10 +107,10 @@ class TestRefill extends TestCase
         $resp = $providers->add(15120035568, 5, 50, ['order_sn' => $this->make_sn()]);
     }
 
-    public function testSuhcOil()
+    public function testTianjtOil()
     {
         $cardno = 1000111100021211884;
-        $providers = new refill\suhc\RefillOil([]);
+        $providers = new refill\tianjt\RefillOil([]);
         $resp = $providers->add($cardno, 2, 500, ['order_sn' => $this->make_sn()]);
     }
 
@@ -153,9 +153,9 @@ class TestRefill extends TestCase
         $resp = $providers->query($refill_info);
     }
 
-    public function testSuhcQuery()
+    public function testTianjtQuery()
     {
-        $providers = new refill\suhc\RefillOil([]);
+        $providers = new refill\tianjt\RefillOil([]);
         $refill_info = ['order_sn' => 680665862267622221, 'ch_trade_no' => 499, 'card_no' => 1000111200005252927];
         $resp = $providers->query($refill_info);
     }
@@ -198,10 +198,10 @@ class TestRefill extends TestCase
 
     }
 
-    public function testSuhcJDVerify()
+    public function testTianjtJDVerify()
     {
-        $data = 'onlystr=920661883198026632&sign=533151e3f0dff5f507786aabc37b18f7&amt=100&notifyurl=https%3A%2F%2Fwww.xyzshops.cn%2Fmobile%2Frefill_suhc.php&jdno&cardtype=Sinoepc&batchid=26106&cardno=1000111100020654226&orgid=1590993600&status=3';
-        $url = "http://192.168.1.220/mobile/refill_suhc.php?" . $data;
+        $data = 'onlystr=920661883198026632&sign=533151e3f0dff5f507786aabc37b18f7&amt=100&notifyurl=https%3A%2F%2Fwww.xyzshops.cn%2Fmobile%2Frefill_tianjt.php&jdno&cardtype=Sinoepc&batchid=26106&cardno=1000111100020654226&orgid=1590993600&status=3';
+        $url = "http://192.168.1.220/mobile/refill_tianjt.php?" . $data;
         $resp = http_request($url);
     }
 
@@ -366,11 +366,11 @@ class TestRefill extends TestCase
     }
 
 
-    public function testSuhcCB()
+    public function testTianjtCB()
     {
-//        $notifyurl = BASE_SITE_URL . "/mobile/refill_suhc.php";
-        $notifyurl = "https://www.xyzshops.cn/mobile/refill_suhc.php";
-//        $notifyurl = "https%3A%2F%2Fwww.xyzshops.cn%2Fmobile%2Frefill_suhc.php";
+//        $notifyurl = BASE_SITE_URL . "/mobile/refill_tianjt.php";
+        $notifyurl = "https://www.xyzshops.cn/mobile/refill_tianjt.php";
+//        $notifyurl = "https%3A%2F%2Fwww.xyzshops.cn%2Fmobile%2Frefill_tianjt.php";
 
         $params = ['onlystr' => '690665858589475818',
             'amt' => 1000,