Merge branch 'ralbex' into rtest

helper/refill/policy/lingzh/quality_ploy.php

@@ -32,7 +32,8 @@ class quality_ploy extends Quality
             self:: OIL_SN_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
             self:: OIL_SNNONE_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
             self:: OIL_SN_SNNONE_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_SNNONE_SN_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180]
+            self:: OIL_SNNONE_SN_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
+            self:: OIL_SNNONE_SN_CARDKEY_QUICK => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180]
         ];
 
         //增加组合通道的时候，注意增加时间控制
@@ -59,7 +60,8 @@ class quality_ploy extends Quality
             self::OIL_SN_CARDKEY => [self::OilWithSN,self::OilCardKey],
             self::OIL_SNNONE_CARDKEY => [self::OilWithoutSN,self::OilCardKey],
             self::OIL_SN_SNNONE_CARDKEY => [self::OilWithSN, self::OilWithoutSN,self::OilCardKey],
-            self::OIL_SNNONE_SN_CARDKEY => [self::OilWithoutSN, self::OilWithSN,self::OilCardKey]
+            self::OIL_SNNONE_SN_CARDKEY => [self::OilWithoutSN, self::OilWithSN,self::OilCardKey],
+            self::OIL_SNNONE_SN_CARDKEY_QUICK => [self::OilWithoutSN, self::OilWithSN,self::OilCardKey,self::Quick]
         ];
     }
 }

helper/refill/policy/mchoilctl.php

@@ -31,7 +31,7 @@ class mchoilctl
 
             } elseif ($quality == Quality::OilSN_NONE_HAS || $quality == Quality::OilSN_HAS_NONE) {
 
-            } elseif ($quality == Quality::OIL_SN_CARDKEY || $quality == Quality::OIL_SNNONE_CARDKEY || $quality == Quality::OIL_SN_SNNONE_CARDKEY || $quality == Quality::OIL_SNNONE_SN_CARDKEY) {
+            } elseif ($quality == Quality::OIL_SN_CARDKEY || $quality == Quality::OIL_SNNONE_CARDKEY || $quality == Quality::OIL_SN_SNNONE_CARDKEY || $quality == Quality::OIL_SNNONE_SN_CARDKEY || $quality == Quality::OIL_SNNONE_SN_CARDKEY_QUICK) {
 
             } else {
                 $quality = Quality::OilSN_NONE_HAS;

helper/refill/policy/quaility.php

@@ -36,6 +36,7 @@ class Quality
     const OIL_SNNONE_CARDKEY    = 23;
     const OIL_SN_SNNONE_CARDKEY = 24;
     const OIL_SNNONE_SN_CARDKEY = 25;
+    const OIL_SNNONE_SN_CARDKEY_QUICK = 26;
 
     protected $mMchPhonectl;
     protected $mMchoilctl;

helper/refill/policy/xyz/quality_ploy.php

@@ -36,7 +36,8 @@ class quality_ploy extends Quality
             self:: OIL_SN_CARDKEY        => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
             self:: OIL_SNNONE_CARDKEY    => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
             self:: OIL_SN_SNNONE_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_SNNONE_SN_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180]
+            self:: OIL_SNNONE_SN_CARDKEY => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
+            self:: OIL_SNNONE_SN_CARDKEY_QUICK => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180]
         ];
 
         //增加组合通道的时候，注意增加时间控制
@@ -65,7 +66,8 @@ class quality_ploy extends Quality
             self::OIL_SN_CARDKEY => [self::OilWithSN,self::OilCardKey],
             self::OIL_SNNONE_CARDKEY => [self::OilWithoutSN,self::OilCardKey],
             self::OIL_SN_SNNONE_CARDKEY => [self::OilWithSN, self::OilWithoutSN,self::OilCardKey],
-            self::OIL_SNNONE_SN_CARDKEY => [self::OilWithoutSN, self::OilWithSN,self::OilCardKey]
+            self::OIL_SNNONE_SN_CARDKEY => [self::OilWithoutSN, self::OilWithSN,self::OilCardKey],
+            self::OIL_SNNONE_SN_CARDKEY_QUICK => [self::OilWithoutSN, self::OilWithSN,self::OilCardKey,self::Quick]
         ];
     }
 }