dev

admin/templates/default/merchant.edit.php

@@ -66,12 +66,12 @@
                     <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 1){ echo 'checked';}?> value="1" type="radio">无流水
                     <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 5){ echo 'checked';}?> value="5" type="radio">有流水
                     <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 3){ echo 'checked';}?> value="3" type="radio">卡密
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 20){ echo 'checked';}?> value="20" type="radio">无流水 + 有流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 21){ echo 'checked';}?> value="21" type="radio">有流水 + 无流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 22){ echo 'checked';}?> value="22" type="radio">卡密 + 有流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 23){ echo 'checked';}?> value="23" type="radio">卡密 + 无流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 24){ echo 'checked';}?> value="24" type="radio">卡密 + 有流水 + 无流水
-                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 25){ echo 'checked';}?> value="25" type="radio">卡密 + 无流水 + 有流水
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 20){ echo 'checked';}?> value="20" type="radio">无流水+有流水
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 21){ echo 'checked';}?> value="21" type="radio">有流水+无流水
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 22){ echo 'checked';}?> value="22" type="radio">有流水+卡密
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 23){ echo 'checked';}?> value="23" type="radio">无流水+卡密
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 24){ echo 'checked';}?> value="24" type="radio">有流水+无流水+卡密
+                    <input name="oil_quality" <?php if($output['merchant']['oil_quality'] == 25){ echo 'checked';}?> value="25" type="radio">无流水+有流水+卡密
                 </td>
             </tr>
             <tr>

helper/refill/policy/lingzh/quality_ploy.php

@@ -29,10 +29,10 @@ class quality_ploy extends Quality
             self::OilSN_NONE_HAS => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
             self::OilSN_HAS_NONE => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
 
-            self:: OIL_CARDKEY_SN        => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_CARDKEY_SNNONE    => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_CARDKEY_SN_SNNONE => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_CARDKEY_SNNONE_SN => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180]
+            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]
         ];
 
         //增加组合通道的时候，注意增加时间控制
@@ -55,10 +55,11 @@ class quality_ploy extends Quality
 
             self::OilSN_NONE_HAS => [self::OilWithoutSN, self::OilWithSN],
             self::OilSN_HAS_NONE => [self::OilWithSN, self::OilWithoutSN],
-            self::OIL_CARDKEY_SN => [self::OilCardKey, self::OilWithSN],
-            self::OIL_CARDKEY_SNNONE => [self::OilCardKey, self::OilWithoutSN],
-            self::OIL_CARDKEY_SN_SNNONE => [self::OilCardKey, self::OilWithSN, self::OilWithoutSN],
-            self::OIL_CARDKEY_SNNONE_SN => [self::OilCardKey, self::OilWithoutSN, self::OilWithSN]
+
+            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]
         ];
     }
 }

helper/refill/policy/mchoilctl.php

@@ -27,16 +27,13 @@ class mchoilctl
             $quality = intval($item['oil_quality']);
             $time_out = $item['time_out'];
 
-            if($quality == Quality::OilWithoutSN || $quality == Quality::OilCardKey || $quality == Quality::OilWithSN ) {
+            if ($quality == Quality::OilWithoutSN || $quality == Quality::OilCardKey || $quality == Quality::OilWithSN) {
 
-            }
-            elseif ($quality == Quality::OilSN_NONE_HAS || $quality == Quality::OilSN_HAS_NONE) {
+            } elseif ($quality == Quality::OilSN_NONE_HAS || $quality == Quality::OilSN_HAS_NONE) {
 
-            }
-            elseif ($quality == Quality::OIL_CARDKEY_SN || $quality == Quality::OIL_CARDKEY_SNNONE || $quality == Quality::OIL_CARDKEY_SN_SNNONE || $quality == Quality::OIL_CARDKEY_SNNONE_SN) {
+            } elseif ($quality == Quality::OIL_SN_CARDKEY || $quality == Quality::OIL_SNNONE_CARDKEY || $quality == Quality::OIL_SN_SNNONE_CARDKEY || $quality == Quality::OIL_SNNONE_SN_CARDKEY) {
 
-            }
-            else {
+            } else {
                 $quality = Quality::OilSN_NONE_HAS;
             }
 

helper/refill/policy/quaility.php

@@ -31,10 +31,10 @@ class Quality
 
     const OilSN_NONE_HAS   = 20;
     const OilSN_HAS_NONE   = 21;
-    const OIL_CARDKEY_SN        = 22;
-    const OIL_CARDKEY_SNNONE    = 23;
-    const OIL_CARDKEY_SN_SNNONE = 24;
-    const OIL_CARDKEY_SNNONE_SN = 25;
+    const OIL_SN_CARDKEY        = 22;
+    const OIL_SNNONE_CARDKEY    = 23;
+    const OIL_SN_SNNONE_CARDKEY = 24;
+    const OIL_SNNONE_SN_CARDKEY = 25;
 
     protected $mMchPhonectl;
     protected $mMchoilctl;

helper/refill/policy/xyz/quality_ploy.php

@@ -15,12 +15,12 @@ class quality_ploy extends Quality
             self::Quick => ['retry_times' => 10, 'retry_timeout' => 120, 'per_secs' => 80],
             self::CardKey => ['retry_times' => 10, 'retry_timeout' => 120, 'per_secs' => 80],
 
-            self::ThirdShop => ['retry_times' => 1, 'retry_timeout' => 900, 'per_secs' => 600],
-            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],
-            self::SlowSeventyTwo => ['retry_times' => 1, 'retry_timeout' => 172800, 'per_secs'  => 259200 - 1800],
+            self::ThirdShop => ['retry_times' => 10, 'retry_timeout' => 900, 'per_secs' => 600],
+            self::SlowTwentyFour => ['retry_times' => 10, 'retry_timeout' => 86400, 'per_secs' => 86400 - 1800],
+            self::SlowSix => ['retry_times' => 10, 'retry_timeout' => 21600, 'per_secs' => 21600 - 900],
+            self::SlowTwo => ['retry_times' => 10, 'retry_timeout' => 7200, 'per_secs' => 7200 - 600],
+            self::SlowFortyEight => ['retry_times' => 10, 'retry_timeout' => 172800, 'per_secs' => 172800 - 1800],
+            self::SlowSeventyTwo => ['retry_times' => 10, 'retry_timeout' => 172800, 'per_secs' => 259200 - 1800],
 
             self::SlowNormal => ['retry_times' => 60, 'retry_timeout' => 7200, 'per_secs' => 180],
             self::ThirdNormal => ['retry_times' => 60, 'retry_timeout' => 900, 'per_secs' => 180],
@@ -33,10 +33,10 @@ class quality_ploy extends Quality
             self::OilSN_NONE_HAS => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
             self::OilSN_HAS_NONE => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
 
-            self:: OIL_CARDKEY_SN        => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_CARDKEY_SNNONE    => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_CARDKEY_SN_SNNONE => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180],
-            self:: OIL_CARDKEY_SNNONE_SN => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 180]
+            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]
         ];
 
         //增加组合通道的时候，注意增加时间控制
@@ -62,10 +62,10 @@ class quality_ploy extends Quality
             self::OilSN_NONE_HAS => [self::OilWithoutSN, self::OilWithSN],
             self::OilSN_HAS_NONE => [self::OilWithSN, self::OilWithoutSN],
 
-            self::OIL_CARDKEY_SN => [self::OilCardKey, self::OilWithSN],
-            self::OIL_CARDKEY_SNNONE => [self::OilCardKey, self::OilWithoutSN],
-            self::OIL_CARDKEY_SN_SNNONE => [self::OilCardKey, self::OilWithSN, self::OilWithoutSN],
-            self::OIL_CARDKEY_SNNONE_SN => [self::OilCardKey, self::OilWithoutSN, self::OilWithSN]
+            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]
         ];
     }
 }