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

core/framework/db/mysqli.php

@@ -132,10 +132,13 @@ class Db
                 } elseif (C('debug')) {
                     throw_exception($error . '<br/>' . $sql);
                     return false;
-                } else {
-//                    if(self::ping($host) == false) {
-//
-//                    }
+                }
+                elseif(self::ping($host) == false) {
+                    if ($count > 0) return false;
+                    self::connect($host);
+                    $count++;
+                }
+                else {
                     return false;
                 }
             }

data/config/xyztest/base.ini.php

@@ -11,7 +11,7 @@ define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
 define('CROSS_DOAMIN',false);
 define('COMPANY_NAME', 'XYZ_COMPANY');
-define('ZERO_GOODS_ID', 6245);
+define('ZERO_GOODS_ID', 6405);
 
 $config = [];
 $config['base_site_url']        = SRV_HOST;

helper/refill/RefillBase.php

@@ -212,7 +212,6 @@ class RefillBase
         }
 
         $minfo = new member_info($buyer_id);
-
         $calc = new ZeroMerchantPrice($mchid, $amount, $card_type,$quality);
         $mch_amount = $calc->calc_vgoods_price([]);
 

helper/refill/api/lingzh/weishengyjd/RefillPhone.php

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

helper/refill/api/lingzh/weishengyjd/config.php

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

helper/refill/api/lingzh/weishengysix/RefillPhone.php

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

helper/refill/api/lingzh/weishengysix/config.php

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

helper/refill/api/lingzh/weishengywt/RefillPhone.php

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

helper/refill/api/lingzh/weishengywt/config.php

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

helper/refill/api/xyz/bingdht/api.txt

@@ -1,11 +1,11 @@
-开发文档：https://docs.qq.com/doc/DWkV1VkxQVk13eEtQ
+寮€鍙戞枃妗ｏ細https://docs.qq.com/doc/DWkV1VkxQVk13eEtQ
 
-话费、油卡下单地址：http://116.62.100.67:10186/plat/api/old/submitorder
-查询地址：http://116.62.100.67:10186/plat/api/old/queryorder
-查询余额地址：http://116.62.100.67:10186/plat/api/old/queryBalance
+璇濊垂銆佹补鍗′笅鍗曞湴鍧€锛歨ttp://116.62.100.67:10186/plat/api/old/submitorder
+鏌ヨ�鍦板潃锛歨ttp://116.62.100.67:10186/plat/api/old/queryorder
+鏌ヨ�浣欓�鍦板潃锛歨ttp://116.62.100.67:10186/plat/api/old/queryBalance
 
-管理端：http://116.62.100.67:10186/plat/index
-账号：bjyz001
-初始密码：123456
-商户ID：200044
-密钥：53c402addd464518960b1eeff9097445
+绠＄悊绔�細http://116.62.100.67:10186/plat/index
+璐﹀彿锛歜jyz001
+初始密码：123456
+商户ID：200044
+密钥：53c402addd464518960b1eeff9097445

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

@@ -19,4 +19,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -19,4 +19,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -19,4 +19,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

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

@@ -45,11 +45,19 @@ class RefillPhone extends refill\IRefillPhone
         {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp, true);
+            $nRtn = intval($resp['nRtn']);
             if (empty($resp)) {
                 return [false, '网络错误', true];
-            } elseif ($resp['nRtn'] == 0) {
+            } elseif ($nRtn == 0) {
                 return [true, '', false];
+            } elseif (in_array($nRtn, config::ERR_NO)) {
+                return [false, $resp['szRtnCode'], false];
+            } elseif (in_array($nRtn, [2050, 999])) {
+                $net_errno = "HTTP-{$nRtn}";
+                return [false, $resp['szRtnCode'], false];
             } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
                 return [false, $resp['szRtnCode'], false];
             }
         }

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

@@ -18,4 +18,8 @@ class config
         mtopcard\ChinaTelecomCard => 3
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;charset=utf-8'];
+
+    const ERR_NO = [
+        1000,1001,1003,1004,2001,2002,2003,2020,2021,1006,2030,3003
+    ];
 }

helper/refill/policy/channel_filter.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace refill;
+
+class channel_filter
+{
+    
+
+}

helper/refill/policy/quaility.php

@@ -184,7 +184,7 @@ class Quality
         $left_time = $time_out - $used_time;
         if($left_time <= 0 || $max_times <= $times) return [];
 
-        Log::record("calc_quality begin qualities = " . implode(',',$qualities),Log::DEBUG);
+        Log::record("calc_quality begin qualities= " . implode(',',$qualities),Log::DEBUG);
         $times_checker = function($qualities, $times)
         {
             $result = [];
@@ -236,9 +236,9 @@ class Quality
         if($times > 0)
         {
             $qualities = $times_checker($qualities,$times);
-            Log::record("calc_quality times_checker result = " . implode($qualities),Log::DEBUG);
+            Log::record("calc_quality times_checker result = " . implode(',', $qualities), Log::DEBUG);
             $qualities = $timeout_checker($qualities,$left_time);
-            Log::record("calc_quality timeout_checker result = " . implode($qualities),Log::DEBUG);
+            Log::record("calc_quality timeout_checker result = " . implode(',', $qualities), Log::DEBUG);
 
             if(!$timeing_checker($qualities)) {
                 $qualities = [];

helper/refill/policy/xyz/quality_ploy.php

@@ -16,7 +16,7 @@ class quality_ploy extends Quality
             self::CardKey => ['retry_times' => 1, 'retry_timeout' => 120, 'per_secs' => 80],
 
             self::ThirdShop => ['retry_times' => 1, 'retry_timeout' => 900, 'per_secs' => 600],
-            self::SlowTwentyFour => ['retry_times' => 1, 'retry_timeout' => 86400, 'per_secs' => 86400],
+            self::SlowTwentyFour => ['retry_times' => 10, 'retry_timeout' => 86400, 'per_secs' => 86400],
             self::SlowSix => ['retry_times' => 1, 'retry_timeout' => 21600, 'per_secs' => 21600],
             self::SlowTwo => ['retry_times' => 1, 'retry_timeout' => 7200, 'per_secs' => 7200],
             self::SlowFortyEight => ['retry_times' => 1, 'retry_timeout' => 172800, 'per_secs' => 172800 - 1800],

rdispatcher/proxy.php

@@ -163,7 +163,6 @@ class proxy
             refill\util::incr_user_commit($mchid,$card_type,$amount,$org_quality);
         }
         Log::record("proxy::add mch_order={$mch_order} card_no = {$card_no} regin_no={$regin_no} org_quality={$org_quality} quality={$quality}",Log::DEBUG);
-
         $order_id = refill\RefillFactory::instance()->zero_order($mchid, $buyer_id, $amount, $card_no,
             $mch_order, $idcard, $card_name, $notify_url, $quality, $org_quality, $order_time, $commit_times,
             "手动0元订单");

test/TestRefillThird.php

@@ -62,6 +62,20 @@ class TestRefillThird extends TestCase
         $proxy->send("https://www.xyzshops.cn/mobile/index.php",$params);
     }
 
+    public function testPushAddZero()
+    {
+        $params = [ 'mchid' => 1092,
+            'buyer_id' => 60221,
+            'amount' => 30,
+            'mch_order' => $this->make_sn(),
+            'org_quality' => 1,
+            'card_no' => '13911129867'
+        ];
+
+        $ret = refill\util::push_add_zero($params);
+        Log::record("push message",Log::DEBUG);
+    }
+
     public function testPushPhone()
     {
         $params = [ 'mchid' => 1092,