fix bug

data/config/dev/refill.ini.php

@@ -1490,7 +1490,7 @@ $config['auto_find_channels'] = true;
 $config['cancel_retry_time'] = [10120 => ["9:00",'10:00','11:00']];
 $config['merchant_retry_times'] = [
     1092 => [
-        'qualities' => [1 => ['secs' => 300, 'times' => 2], 2 => ['secs' => 300, 'times' => 2]],
+        'qualities' => [1 => ['secs' => 300, 'times' => 5], 2 => ['secs' => 300, 'times' => 200]],
         'lower_ratio' => ['ratio' => 0.9,'period' => 3600]
     ]    
 ];

data/config/xyztest/refill.ini.php

@@ -2016,7 +2016,7 @@ $config['auto_find_channels'] = true;
 $config['cancel_retry_time'] = [10120 => ["9:00",'10:00','11:00']];
 $config['merchant_retry_times'] = [
     1092 => [
-        'qualities' => [1 => ['secs' => 8, 'times' => 10], 2 => ['secs' => 4, 'times' => 6]],
+        'qualities' => [1 => ['secs' => 1500, 'times' => 100], 2 => ['secs' => 900, 'times' => 100]],
         'lower_ratio' => ['ratio' => 0.9,'period' => 3600]
     ]
 ];

helper/refill/api/test/jumikc/RefillPhone.php

@@ -27,7 +27,7 @@ class RefillPhone extends refill\IRefillPhone
 
     public function add($card_no, $card_type, $amount, $params,&$net_errno = 0)
     {
-        refill\util::send_normal($params['order_sn']);
+        refill\util::send_quick($params['order_sn']);
         return [true , '',false];
     }
 

helper/refill/api/test/zhenqi1m/RefillPhone.php

@@ -28,7 +28,7 @@ class RefillPhone extends refill\IRefillPhone
 
     public function add($card_no, $card_type, $amount, $params,&$net_errno = 0)
     {
-        refill\util::send_normal($params['order_sn']);
+        refill\util::send_quick($params['order_sn']);
         return [true , '',false];
     }
 

helper/refill/policy/channel_filter.php

@@ -75,7 +75,8 @@ class channel_filter
         } elseif ($this->mQuality == Quality::Normal) {
             return $this->asc($inProviders,1,10);
         } elseif ($this->mQuality == Quality::Quick) {
-            return $this->diff($inProviders);
+            return $this->asc($inProviders,1,2);
+//            return $this->diff($inProviders);
         } else {
             return $this->asc($inProviders,1,1);
         }

helper/refill/policy/mratio_control.php

@@ -42,9 +42,9 @@ class mratio_control
     {
         if(array_key_exists($mchid,$this->mTimesConfig))
         {
-            $items = $this->mTimesConfig[$mchid];
-            if(array_key_exists($quality,$items['qualities'])) {
-                return $items['qualities'][$quality]['times'];
+            $items = $this->mTimesConfig[$mchid]['qualities'] ?? [];
+            if(array_key_exists($quality,$items)) {
+                return $items[$quality]['times'];
             }
         }
 
@@ -57,7 +57,7 @@ class mratio_control
         {
             $items = $this->mTimesConfig[$mchid]['qualities'] ?? [];
             if(array_key_exists($quality,$items)) {
-                return $items['qualities'][$quality]['secs'];
+                return $items[$quality]['secs'];
             }
         }
 
@@ -105,6 +105,6 @@ class mratio_control
         [$ratio,$period] = $this->lower_ratio($mchid);
         $cur_ratio = $this->cur_ratio($mchid,$period);
 
-        return $ratio >= $cur_ratio;
+        return $cur_ratio >= $ratio;
     }
 }

helper/refill/some-code.php

@@ -1,19 +0,0 @@
-<?php
-
-
-
-//        $ascending = function ($l, $r) use ($amount) {
-//            [$lid, $lprice] = $l->goods($amount);
-//            [$rid, $rprice] = $r->goods($amount);
-//
-//            $lsort = $l->sort();
-//            $rsort = $r->sort();
-//
-//            if($lprice == $rprice) {
-//                return $lsort < $rsort ? -1 : 1;
-//            }
-//            else {
-//                return $lprice < $rprice ? -1 : 1;
-//            }
-//        };
-//        usort($providers, $ascending);

helper/refill/util.php

@@ -626,11 +626,12 @@ class util
     {
         sleep(1);
         $status = mt_rand(1,10);
-        if($status > 5) {
+        if($status > 3) {
             $status = 1;
         } else {
             $status = 0;
         }
+
         $url = BASE_SITE_URL . "/mobile/callback/refill_baidu.php";
         go(function () use ($url, $status,$order_sn) {
             sleep(1);

test/TestRefillThird.php

@@ -82,7 +82,7 @@ class TestRefillThird extends TestCase
             'buyer_id' => 60221,
             'amount' => 30,
             'mch_order' => $this->make_sn(),
-            'org_quality' => 1,
+//            'org_quality' => 1,
             'card_no' => '13911129867' //,
 //            'card_type' => 5,
 //            'regin_no' => 1
@@ -102,7 +102,7 @@ class TestRefillThird extends TestCase
                 'buyer_id' => 60221,
                 'amount' => 30,
                 'mch_order' => "{$time}" . sprintf("%'010d",$i),
-                'org_quality' => 1,
+//                'org_quality' => 1,
                 'card_no' => '13911129867',
 //                'card_type' => 5,
 //                'regin_no' => 1