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

data/config/prod/refill.ini.php

@@ -69,13 +69,16 @@ $bxtwt_phone = ['name' => 'bxtwt', 'store_id' => 10, 'card_type' => ['chinamobil
         200 => ['goods_id' => 6300, 'price' => 192]],
     'refill_type' => 'api'];
 
-$bjb_phone = ['name' => 'bjb', 'store_id' => 12, 'card_type' => ['chinamobile' ,/*'chinaunicom', */'chinatelecom'],
+$bjb_phone = ['name' => 'bjb', 'store_id' => 12, 'card_type' => ['chinamobile' ,'chinaunicom', 'chinatelecom'],
     'amount' => [10 => ['goods_id' => 6305, 'price' => 9.55],
         20 => ['goods_id' => 6306, 'price' => 19.1],
         30 => ['goods_id' => 6301, 'price' => 28.65],
         50 => ['goods_id' => 6302, 'price' => 47.75],
         100 => ['goods_id' => 6303, 'price' => 95.5],
-        200 => ['goods_id' => 6304, 'price' => 191]], 'official_sn' => true, 'refill_type' => 'api'];
+        200 => ['goods_id' => 6304, 'price' => 191],
+        300 => ['goods_id' => 6327, 'price' => 286.5],
+        500 => ['goods_id' => 6328, 'price' => 477.5]],
+    'official_sn' => true, 'refill_type' => 'api'];
 
 $yifa_phone = ['name' => 'yifa', 'store_id' => 16, 'card_type' => ['chinamobile'],
     'amount' => [30 => ['goods_id' => 6318, 'price' => 28.65],
@@ -84,16 +87,27 @@ $yifa_phone = ['name' => 'yifa', 'store_id' => 16, 'card_type' => ['chinamobile'
         200 => ['goods_id' => 6321, 'price' => 191]],
     'refill_type' => 'api'];
 
-$jiec_phone = ['name' => 'jiec', 'store_id' => 17, 'card_type' => ['chinaunicom', 'chinatelecom'],
+$jiec_phone = ['name' => 'jiec', 'store_id' => 17, 'card_type' => ['chinamobile', 'chinaunicom', 'chinatelecom'],
     'amount' => [30 => ['goods_id' => 6323, 'price' => 28.65],
         50 => ['goods_id' => 6324, 'price' => 47.75],
         100 => ['goods_id' => 6325, 'price' => 95.5],
-        200 => ['goods_id' => 6326, 'price' => 191]], 'official_sn' => true, 'refill_type' => 'api'];
+        200 => ['goods_id' => 6326, 'price' => 191],
+        300 => ['goods_id' => 6329, 'price' => 286.5],
+        500 => ['goods_id' => 6330, 'price' => 477.5]], 'official_sn' => true, 'refill_type' => 'api'];
+
+$weit_phone = ['name' => 'weit', 'store_id' => 18, 'card_type' => ['chinamobile', 'chinaunicom', 'chinatelecom'],
+    'amount' => [30 => ['goods_id' => 6331, 'price' => 28.5],
+        50 => ['goods_id' => 6332, 'price' => 47.5],
+        100 => ['goods_id' => 6333, 'price' => 95],
+        200 => ['goods_id' => 6334, 'price' => 190],
+        300 => ['goods_id' => 6335, 'price' => 285],
+        500 => ['goods_id' => 6336, 'price' => 475]], 'official_sn' => true, 'refill_type' => 'api'];
 
 $phone_providers = [
     ['name' => 'beixt', 'cfg' => $beixt_phone, 'opened' => false, 'sort' => 1],
     ['name' => 'bxtwt', 'cfg' => $bxtwt_phone, 'opened' => false, 'sort' => 2],
     ['name' => 'bjb', 'cfg' => $bjb_phone, 'opened' => false, 'sort' => 2],
     ['name' => 'yifa', 'cfg' => $yifa_phone, 'opened' => false, 'sort' => 5],
-    ['name' => 'jiec', 'cfg' => $jiec_phone, 'opened' => true, 'sort' => 1]];
+    ['name' => 'jiec', 'cfg' => $jiec_phone, 'opened' => true, 'sort' => 1],
+    ['name' => 'weit', 'cfg' => $weit_phone, 'opened' => false, 'sort' => 1]];
 $config['phone_providers'] = $phone_providers;

helper/fcgi_server.php

@@ -31,7 +31,7 @@ class fcgi_server
             'refill_suhc.php','refill_suhctm.php','refill_suhcpdd.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'
+            'bridge_shr.php','refill_weit.php'
         ];
         $path = BASE_ROOT_PATH . '/mobile/';
         $file = str_replace($path,'',$file);

helper/refill/RefillFactory.php

@@ -58,6 +58,9 @@ require_once(BASE_HELPER_PATH . '/refill/jiec/RefillCallBack.php');
 require_once(BASE_HELPER_PATH . '/refill/xc/RefillPhone.php');
 require_once(BASE_HELPER_PATH . '/refill/xc/RefillCallBack.php');
 
+require_once(BASE_HELPER_PATH . '/refill/weit/RefillPhone.php');
+require_once(BASE_HELPER_PATH . '/refill/weit/RefillCallBack.php');
+
 use Log;
 use mtopcard;
 use QueueClient;

helper/refill/weit/RefillCallBack.php

@@ -0,0 +1,53 @@
+<?php
+
+
+namespace refill\weit;
+
+require_once(BASE_HELPER_PATH . '/refill/weit/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 = config::MCH_ID . $params['pt_order_id'] . $params['mch_order_id'] . $params['op_order_id'] . $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['mch_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['op_order_id']) == 'null' ? '' : $params['op_order_id'];
+        $data['ch_trade_no'] = strtolower($params['pt_order_id']) == 'null' ? '' : $params['pt_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/weit/RefillPhone.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace refill\weit;
+
+require_once(BASE_HELPER_PATH . '/refill/weit/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['mchid'] = config::MCH_ID;
+        $params['tel'] = $phone;
+        $params['mch_order_id'] = $order_sn;
+        $params['price'] = $amount;
+        $params['teltype'] = $this->phone_type($phone);
+        $params['timeout'] = 50;
+        $params['notify'] = config::NOTIFY_URL;
+        $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');
+        if ($resp === false) {
+            return [false, '系统错误'];
+        } else {
+            Log::record($resp, Log::DEBUG);
+            $resp = json_decode($resp, true);
+            if ($resp['code'] == 0) {
+                return [true, $resp['pt_order_id']];
+            } else {
+                return [false, $resp['msg']];
+            }
+        }
+    }
+
+    public function query($refill_info)
+    {
+        $params['mchid'] = config::MCH_ID;
+        $params['mch_order_id'] = $refill_info['order_sn'];
+        $params['pt_order_id'] = $refill_info['ch_trade_no'];
+        $params['op_order_id '] = $refill_info['official_sn'];
+        $params['tel'] = $refill_info['card_no'];
+        $params['time '] = time();
+        $params['rand'] = rand(100000,999999);
+        $content = $params['mchid'] . $params['pt_order_id'] . $params['mch_order_id'] . $params['op_order_id'] . $params['tel'] . $params['time'] . $params['rand'] . config::KEY;
+        $params['sign'] = md5($content);
+        $resp = http_request(config::QUERY_URL, $params , 'POST');
+        if ($resp === false) {
+            return [false, '系统错误'];
+        } else {
+            Log::record($resp, Log::DEBUG);
+            $resp = json_decode($resp, true);
+            if ($resp['code'] == 0) {
+                if ($resp['data']['status'] == 1) {
+                    $order_state = ORDER_STATE_SUCCESS;
+                } elseif ($resp['data']['status'] == 0) {
+                    $order_state = ORDER_STATE_CANCEL;
+                } elseif ($resp['data']['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['mch_order_id'] . $params['price'] . $params['teltype'] . $params['timeout'] . $params['notify'] . $params['time'];
+        $content .= $params['rand'] . $key;
+        return md5($content);
+    }
+    private function phone_type($phone)
+    {
+        $card_type = mtopcard\card_type($phone);
+
+        if ($card_type == mtopcard\ChinaMobileCard) {
+            return 2;
+        } elseif ($card_type == mtopcard\ChinaUnicomCard) {
+            return 1;
+        } elseif ($card_type == mtopcard\ChinaTelecomCard) {
+            return 3;
+        }
+    }
+}

helper/refill/weit/config.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace refill\weit;
+
+
+class config
+{
+    const ORDER_URL = 'http://47.98.208.197/api/telpay';
+    const QUERY_URL = 'http://47.98.208.197/api/telpay/query';
+
+    const MCH_ID = 10014;
+    const KEY = 'f2962db97df033cac91e3f082dc342bf';
+    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/refill_weit.php";
+    const ExtHeaders = ['Content-Type: application/x-www-form-urlencoded'];
+}

mobile/refill_weit.php

@@ -0,0 +1,10 @@
+<?php
+
+require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
+
+$content = $_SERVER['post_content'];
+$input = json_decode($content,true);
+
+refill\RefillFactory::instance()->notify('weit',$input);
+
+echo ('success');

test/TestRefill.php

@@ -94,6 +94,27 @@ class TestRefill extends TestCase
         $resp = $providers->add(15120035568, 5, 50, ['order_sn' => $this->make_sn()]);
     }
 
+    public function testWeitPhone()
+    {
+        $providers = new refill\weit\RefillPhone([]);
+        $resp = $providers->add(18500608333, 5, 30, ['order_sn' => $this->make_sn()]);
+    }
+
+    public function testWeitCB()
+    {
+        $params['sign'] = '71388c374f8baff4416f5259f3247f8b';
+        $params['status'] = 1;
+        $params['price'] = 30;
+        $params['op_order_id'] = '110103307222101171722330401715';
+        $params['mch_order_id'] = '85481610875341834331';
+        $params['pt_order_id'] = '2021011709222323720916807918';
+        $params['pay_type'] = 1;
+        $params['tel'] = 18500608333;
+        $params['mchid'] = 10014;
+        $providers = new refill\weit\RefillCallBack();
+        $resp = $providers->verify($params);
+    }
+
     public function testYifaCB()
     {
         $body = '{"app_id":"e4a61b2acf1119c72c1ed9b61781494e","nonce_str":"OQMEBRQWJGPKOWYUXDVPTNMLEQJHXFWG","timestamp":1610275083,"order_sn":"161027325773032634","coder_order_sn":"60641610273255214687","isp_order_sn":null,"phone":"15120035568","amount":"94.000","discount":"0.9400","create_time":"2021-01-10 18:07:42","recharge_time":"","status":"fail","channel_id":3,"sign":"47278AD74EFA7F5FC8DE3A6D362C409B"}';