afandnew

helper/fcgi_server.php

@@ -31,8 +31,8 @@ class fcgi_server
             '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','refill_tianx.php','refill_afand.php',
-            'refill_afandeng.php'
+            'bridge_shr.php','refill_weit.php','refill_afand.php','refill_afandeng.php',
+            'refill_afandnew.php'
         ];
         $path = BASE_ROOT_PATH . '/mobile/';
         $file = str_replace($path,'',$file);

helper/refill/RefillFactory.php

@@ -71,15 +71,15 @@ require_once(BASE_HELPER_PATH . '/refill/weit/RefillCallBack.php');
 require_once(BASE_HELPER_PATH . '/refill/bjbyd/RefillPhone.php');
 require_once(BASE_HELPER_PATH . '/refill/bjbyd/RefillCallBack.php');
 
-require_once(BASE_HELPER_PATH . '/refill/tianx/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/tianx/RefillCallBack.php');
-
 require_once(BASE_HELPER_PATH . '/refill/afand/RefillPhone.php');
 require_once(BASE_HELPER_PATH . '/refill/afand/RefillCallBack.php');
 
 require_once(BASE_HELPER_PATH . '/refill/afandeng/RefillPhone.php');
 require_once(BASE_HELPER_PATH . '/refill/afandeng/RefillCallBack.php');
 
+require_once(BASE_HELPER_PATH . '/refill/afandnew/RefillPhone.php');
+require_once(BASE_HELPER_PATH . '/refill/afandnew/RefillCallBack.php');
+
 use Log;
 use mtopcard;
 use QueueClient;

helper/refill/afand/RefillPhone.php

@@ -69,7 +69,7 @@ class RefillPhone extends refill\IRefillPhone
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
             if ($resp['code'] == 0) {
-                $order_state = '';
+                $order_state = -1;
                 if ($resp['status'] == 3) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['status'] == 4) {
@@ -77,7 +77,7 @@ class RefillPhone extends refill\IRefillPhone
                 } elseif ($resp['status'] == 2){
                     $order_state = ORDER_STATE_SEND;
                 }
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['data']];
                 }
                 return [true, $order_state];

helper/refill/afandeng/RefillPhone.php

@@ -59,7 +59,7 @@ class RefillPhone extends refill\IRefillPhone
         } else {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
-            $order_state = '';
+            $order_state = -1;
             if ($resp['code'] == 200) {
                 $order_state = ORDER_STATE_SUCCESS;
             } elseif ($resp['code'] == 604) {
@@ -67,7 +67,7 @@ class RefillPhone extends refill\IRefillPhone
             } elseif ($resp['code'] == 603){
                 $order_state = ORDER_STATE_SEND;
             }
-            if (empty($order_state)) {
+            if ($order_state == -1) {
                 return [false, $resp['msg']];
             }
             return [true, $order_state];

helper/refill/afandnew/RefillPhone.php

@@ -18,12 +18,12 @@ class RefillPhone extends refill\IRefillPhone
     private function req_params(int $phone, int $amount, string $order_sn)
     {
         $params['tel'] = $phone;
-        $params['price'] = $amount;
+        $params['price'] = intval($amount);
         $params['mchid'] = config::MCHID;
         $params['orderid'] = $order_sn;
         $params['notify'] = config::NOTIFY_URL;
         $params['teltype'] = 0;
-        $params['timeout'] = 180;
+        $params['timeout'] = 300;
         $params['time'] = time();
         $params['rand'] = rand(100000,999999);
 
@@ -63,7 +63,7 @@ class RefillPhone extends refill\IRefillPhone
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
             if ($resp['code'] == 100) {
-                $order_state = '';
+                $order_state = -1;
                 if ($resp['status'] == 3) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['status'] == 4) {
@@ -71,7 +71,7 @@ class RefillPhone extends refill\IRefillPhone
                 } elseif ($resp['status'] == 2){
                     $order_state = ORDER_STATE_SEND;
                 }
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['data']];
                 }
                 return [true, $order_state];

helper/refill/afandnew/config.php

@@ -11,6 +11,6 @@ class config
 
     const MCHID = 10002;
     const KEY = '95efedd2b18ecae8eec34284df0082da';
-    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/signature.php";
+    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/refill_afandnew.php";
     const ExtHeaders = ['Content-Type: application/x-www-form-urlencoded'];
 }

helper/refill/bjb/RefillPhone.php

@@ -70,7 +70,7 @@ class RefillPhone extends refill\IRefillPhone
             if(count($resp) != 3) {
                 return [false,'返回值错误'];
             }
-            $order_state = '';
+            $order_state = -1;
             if ($resp[0] == 1) {
                 $order_state = ORDER_STATE_SUCCESS;
             } elseif ($resp[0] == 2) {
@@ -78,7 +78,7 @@ class RefillPhone extends refill\IRefillPhone
             } elseif ($resp[0] == 0){
                 $order_state = ORDER_STATE_SEND;
             }
-            if (empty($order_state)) {
+            if ($order_state == -1) {
                 return [false, $resp[0]];
             }
             return [true, $order_state];

helper/refill/bjbnew/RefillPhone.php

@@ -63,7 +63,7 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp,Log::DEBUG);
             $resp = $this->xmlToArray($resp);
-            $order_state = '';
+            $order_state = -1;
             if ($resp['resultno'] == 0014) {
                 $order_state = ORDER_STATE_SUCCESS;
             } elseif ($resp['resultno'] == 0015) {
@@ -71,7 +71,7 @@ class RefillPhone extends refill\IRefillPhone
             } elseif ($resp['resultno'] == 0016){
                 $order_state = ORDER_STATE_SEND;
             }
-            if (empty($order_state)) {
+            if ($order_state == -1) {
                 return [false, $resp['resultmessage']];
             }
             return [true, $order_state];

helper/refill/bjbyd/RefillPhone.php

@@ -68,7 +68,7 @@ class RefillPhone extends refill\IRefillPhone
             if(count($resp) != 3) {
                 return [false,'返回值错误'];
             }
-            $order_state = '';
+            $order_state = -1;
             if ($resp[0] == 1) {
                 $order_state = ORDER_STATE_SUCCESS;
             } elseif ($resp[0] == 2) {
@@ -76,7 +76,7 @@ class RefillPhone extends refill\IRefillPhone
             } elseif ($resp[0] == 0){
                 $order_state = ORDER_STATE_SEND;
             }
-            if (empty($order_state)) {
+            if ($order_state == -1) {
                 return [false, $resp[0]];
             }
             return [true, $order_state];

helper/refill/saihu/RefillOil.php

@@ -71,7 +71,7 @@ class RefillOil extends refill\IRefillOil
             $resp = json_decode($resp, true);
             if ($resp['code'] == 0)
             {
-                $order_state = '';
+                $order_state = -1;
                 if ($resp['result']['order_state'] == 1) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['result']['order_state'] == 9) {
@@ -80,7 +80,7 @@ class RefillOil extends refill\IRefillOil
                     $order_state = ORDER_STATE_SEND;
                 }
 
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['result']];
                 }
 

helper/refill/suhcpdd/RefillOil.php

@@ -92,7 +92,7 @@ class RefillOil extends refill\IRefillOil
             Log::record($resp,Log::DEBUG);
             $resp = json_decode($resp,true);
             if($resp['state'] == 0) {
-                $order_state = '';
+                $order_state = -1;
                 if ($resp['status'] == 2) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['status'] == 3) {
@@ -100,7 +100,7 @@ class RefillOil extends refill\IRefillOil
                 } elseif ($resp['status'] == 0){
                     $order_state = ORDER_STATE_SEND;
                 }
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['data']];
                 }
                 return [true, $order_state];

helper/refill/suhctm/RefillOil.php

@@ -92,7 +92,7 @@ class RefillOil extends refill\IRefillOil
             Log::record($resp,Log::DEBUG);
             $resp = json_decode($resp,true);
             if($resp['state'] == 0) {
-                $order_state = '';
+                $order_state = -1;
                 if ($resp['status'] == 2) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['status'] == 3) {
@@ -100,7 +100,7 @@ class RefillOil extends refill\IRefillOil
                 } elseif ($resp['status'] == 0){
                     $order_state = ORDER_STATE_SEND;
                 }
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['data']];
                 }
                 return [true, $order_state];

helper/refill/tianjt/RefillOil.php

@@ -92,7 +92,7 @@ class RefillOil extends refill\IRefillOil
             Log::record($resp,Log::DEBUG);
             $resp = json_decode($resp,true);
             if($resp['state'] == 0) {
-                $order_state = '';
+                $order_state = -1;
                 if ($resp['data']['status'] == 2) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['data']['status'] == 3) {
@@ -100,7 +100,7 @@ class RefillOil extends refill\IRefillOil
                 } elseif ($resp['data']['status'] == 0){
                     $order_state = ORDER_STATE_SEND;
                 }
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['data']];
                 }
                 return [true, $order_state];

helper/refill/tianx/RefillCallBack.php

@@ -1,52 +0,0 @@
-<?php
-
-
-namespace refill\tianx;
-
-require_once(BASE_HELPER_PATH . '/refill/tianx/config.php');
-
-
-use refill;
-
-class RefillCallBack implements refill\IRefillCallBack
-{
-    public function verify($params): bool
-    {
-        $sign = $this->sign($params);
-        if ($params['sign'] == $sign) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    private function sign($params)
-    {
-        $content = $params['order_id'] . $params['out_order_id'] . config::MCHID . $params['tel'] . $params['price'] . $params['pay_type'] . $params['status'] . config::KEY;
-        return md5($content);
-    }
-
-    public function notify($params)
-    {
-        $status = intval($params['status']);
-        $order_sn = $params['order_id'];
-        $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
-        if (empty($order_info)) {
-            return [false, false, false,false];
-        }
-        $order_id = $order_info['order_id'];
-        
-        $data['official_sn'] = strtolower($params['out_order_id']) == 'null' ? '' : $params['out_order_id'];
-        Model('refill_order')->edit($order_id, $data);
-
-        if ($status === 1) {
-            return [$order_id, true, false,true];
-        }
-        elseif ($status === 0) {
-            return [$order_id, false, true,true];
-        }
-        else {
-            return [$order_id, false, false,false];
-        }
-    }
-}

helper/refill/tianx/RefillPhone.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace refill\tianx;
-
-require_once(BASE_HELPER_PATH . '/refill/tianx/config.php');
-
-use refill;
-use Log;
-use mtopcard;
-
-class RefillPhone extends refill\IRefillPhone
-{
-    public function __construct($cfgs)
-    {
-        parent::__construct($cfgs);
-    }
-
-    private function req_params(int $phone, int $amount, string $order_sn)
-    {
-        $params['tel'] = $phone;
-        $params['price'] = $order_sn;
-        $params['mchid'] = config::MCHID;
-        $params['orderid'] = $amount;
-        $params['notify'] = config::NOTIFY_URL;
-        $params['teltype'] = $this->phone_type($phone);
-        $params['timeout'] = 180;
-        $params['time'] = time();
-        $params['rand'] = rand(100000,999999);
-
-        return $params;
-    }
-
-    public function add($card_no, $card_type, $amount, $params)
-    {
-        $params = $this->req_params($card_no, $amount, $params['order_sn']);
-        $sign = $this->sign($params);
-        $params['sign'] = $sign;
-
-        $resp = http_request(config::ORDER_URL, $params , 'POST' , false , config::ExtHeaders);
-        if ($resp === false) {
-            return [false, '系统错误'];
-        } else {
-            Log::record($resp, Log::DEBUG);
-            $resp = json_decode($resp, true);
-            if ($resp['code'] == 0) {
-                return [true, $resp['order_id']];
-            } else {
-                return [false, $resp['msg']];
-            }
-        }
-    }
-
-    public function query($refill_info)
-    {
-        $params['orderid'] = $refill_info['order_sn'];
-        $params['mchid'] = config::MCHID;
-        $content = $params['mchid'] . $params['orderid'] . config::KEY;
-        $params['sign'] = md5($content);
-        $resp = http_request(config::QUERY_URL, $params , 'POST' , false , config::ExtHeaders);
-        if ($resp === false) {
-            return [false, '系统错误'];
-        } else {
-            Log::record($resp, Log::DEBUG);
-            $resp = json_decode($resp, true);
-            if ($resp['code'] == 100) {
-                $order_state = '';
-                if ($resp['status'] == 3) {
-                    $order_state = ORDER_STATE_SUCCESS;
-                } elseif ($resp['status'] == 4) {
-                    $order_state = ORDER_STATE_CANCEL;
-                } elseif ($resp['status'] == 2){
-                    $order_state = ORDER_STATE_SEND;
-                }
-                if (empty($order_state)) {
-                    return [false, $resp['data']];
-                }
-                return [true, $order_state];
-            } else {
-                return [false, $resp['msg']];
-            }
-        }
-    }
-
-    private function sign($params)
-    {
-        $key = config::KEY;
-        $content  = $params['mchid'] . $params['tel'] . $params['price'] . $params['orderid'] . $params['teltype'] . $params['timeout'] . $params['notify'];
-        $content .= $params['time'] . $params['rand'] . $key;
-        return md5($content);
-    }
-
-    private function phone_type($phone)
-    {
-        $card_type = mtopcard\card_type($phone);
-
-        if ($card_type == mtopcard\ChinaMobileCard) {
-            return 0;
-        } elseif ($card_type == mtopcard\ChinaUnicomCard) {
-            return 1;
-        } elseif ($card_type == mtopcard\ChinaTelecomCard) {
-            return 2;
-        }
-    }
-}

helper/refill/tianx/config.php

@@ -1,16 +0,0 @@
-<?php
-
-
-namespace refill\tianx;
-
-
-class config
-{
-    const ORDER_URL = 'http://8.136.183.28:8082/api/telpay';
-    const QUERY_URL = 'http://8.136.183.28:8082/api/telpay/query';
-
-    const MCHID = 10129;
-    const KEY = '13deaf699da2d81bf9ca2c15a0d1c171';
-    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/refill_tianx.php";
-    const ExtHeaders = ['Content-Type: application/x-www-form-urlencoded'];
-}

helper/refill/weit/RefillPhone.php

@@ -70,6 +70,7 @@ class RefillPhone extends refill\IRefillPhone
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
             if ($resp['code'] == 0) {
+                $order_state = -1;
                 if ($resp['data']['status'] == 1) {
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resp['data']['status'] == 0) {
@@ -77,7 +78,7 @@ class RefillPhone extends refill\IRefillPhone
                 } elseif ($resp['data']['status'] == 2){
                     $order_state = ORDER_STATE_SEND;
                 }
-                if (empty($order_state)) {
+                if ($order_state == -1) {
                     return [false, $resp['data']];
                 }
                 return [true, $order_state];

helper/refill/xc/RefillPhone.php

@@ -60,7 +60,7 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp,Log::DEBUG);
             $resp = json_decode($resp,true);
-            $order_state = '';
+            $order_state = -1;
             if ($resp['status'] == 1) {
                 $order_state = ORDER_STATE_SUCCESS;
             } elseif ($resp['status'] == 2) {
@@ -68,7 +68,7 @@ class RefillPhone extends refill\IRefillPhone
             } elseif ($resp['status'] == 6){
                 $order_state = ORDER_STATE_SEND;
             }
-            if (empty($order_state)) {
+            if ($order_state == -1) {
                 return [false, $resp['data']];
             }
             return [true, $order_state];

helper/refill/zzx/RefillOil.php

@@ -81,7 +81,7 @@ class RefillOil extends refill\IRefillOil
         else {
             Log::record($resp,Log::DEBUG);
             $resp = json_decode($resp,true);
-            $order_state = '';
+            $order_state = -1;
             if ($resp['code'] == 0000) {
                 $order_state = ORDER_STATE_SUCCESS;
             } elseif ($resp['code'] == 0004) {
@@ -89,7 +89,7 @@ class RefillOil extends refill\IRefillOil
             } elseif ($resp['code'] == 0005){
                 $order_state = ORDER_STATE_SEND;
             }
-            if (empty($order_state)) {
+            if ($order_state == -1) {
                 return [false, $resp['msg']];
             }
             return [true, $order_state];

mobile/refill_tianx.php

@@ -3,7 +3,7 @@
 //捷充的回调接口
 require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 
-refill\RefillFactory::instance()->notify('tianx',$_POST);
+refill\RefillFactory::instance()->notify('afandnew',$_POST);
 
 echo ('success');
 

test/TestRefill.php

@@ -123,7 +123,15 @@ class TestRefill extends TestCase
     public function testAfandnewPhone()
     {
         $providers = new refill\afandnew\RefillPhone([]);
-        $resp = $providers->add(18500608333, 4, 30, ['order_sn' => $this->make_sn()]);
+        $resp = $providers->query(['order_sn' => '54481615109732967195']);
+//        $input['order_id'] = '54481615109732967195';
+//        $input['mchid'] = 10002;
+//        $input['tel'] = 13699279618;
+//        $input['price'] = '30.00';
+//        $input['status'] = 0;
+//        $input['out_order_id'] = '0';
+//        $input['sign'] = '26b0baef38daba7f423da23bfe56e3e0';
+//        refill\RefillFactory::instance()->notify('afandnew',$input);
     }
 
     public function testYifaPhone()
@@ -139,13 +147,6 @@ class TestRefill extends TestCase
         $resp = $providers->add($cardno, 2, 500, ['order_sn' => $this->make_sn()]);
     }
 
-    public function testTianxPhone()
-    {
-        $cardno = 13699279618;
-        $providers = new refill\tianx\RefillPhone([]);
-        $resp = $providers->add($cardno, 4, 50, ['order_sn' => $this->make_sn()]);
-    }
-
     public function testWeitPhone()
     {
         $providers = new refill\weit\RefillPhone([]);