dev

admin/templates/default/merchant.ctl.php

@@ -440,6 +440,12 @@
                                 echo 'checked';
                             } ?> value="<?php echo refill\Quality::NormalQuickCardkey; ?>" type="radio">
                         </label>普充+快充+卡密(<span style="color: red;"><?php echo refill\Quality::NormalQuickCardkey; ?></span>)
+
+                        <label>
+                            <input name="quality" <?php if ($output['merchant']['quality'] == refill\Quality::QuickCardkey) {
+                                echo 'checked';
+                            } ?> value="<?php echo refill\Quality::QuickCardkey; ?>" type="radio">
+                        </label>快充+卡密(<span style="color: red;"><?php echo refill\Quality::QuickCardkey; ?></span>)
                     </td>
                 </tr>
                 <tr>

admin/templates/default/merchant.price.php

@@ -96,6 +96,7 @@
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::Quick; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::Quick; ?>"><span>快速费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::CardKey; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::CardKey; ?>"><span>卡密费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::NormalQuickCardkey; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::NormalQuickCardkey; ?>"><span>普通+快充+卡密</span></a></li>
+                <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::QuickCardkey; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::QuickCardkey; ?>"><span>快充+卡密</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::ThirdShop; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::ThirdShop; ?>"><span>三方费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::SlowTwentyFour; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::SlowTwentyFour; ?>"><span>慢24(有流水)费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::SlowSix; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::SlowSix; ?>"><span>慢6费率设置</span></a></li>

admin/templates/default/third.merchant.price.php

@@ -81,6 +81,7 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::Quick; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::Quick; ?>"><span>快速费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::CardKey; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::CardKey; ?>"><span>卡密费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::NormalQuickCardkey; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::NormalQuickCardkey; ?>"><span>普通+快充+卡密</span></a></li>
+                <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::QuickCardkey; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::QuickCardkey; ?>"><span>快充+卡密</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::ThirdShop; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::ThirdShop; ?>"><span>三方费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::SlowTwentyFour; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::SlowTwentyFour; ?>"><span>慢24(有流水)费率设置</span></a></li>
                 <li><a href="index.php?act=merchant&op=price&quality=<?php echo refill\Quality::SlowSix; ?>&mchid=<?php echo $_GET['mchid'] ?>" class="classA" data-quality="<?php echo refill\Quality::SlowSix; ?>"><span>慢6费率设置</span></a></li>

helper/refill/policy/PolicyUtil.php

@@ -4,7 +4,7 @@ namespace refill;
 
 class PolicyUtil
 {
-    private const MixedQuality = [Quality::DefSuccess, Quality::NormalCardkey, Quality::NormalQuick,Quality::NormalQuickCardkey];
+    private const MixedQuality = [Quality::DefSuccess, Quality::NormalCardkey, Quality::NormalQuick, Quality::NormalQuickCardkey, Quality::QuickCardkey];
     public static function mixed_quality($quality) : bool
     {
         if(in_array($quality,PolicyUtil::MixedQuality)) {

helper/refill/policy/mchctl.php

@@ -34,7 +34,8 @@ class mchctl
                 $quality == Quality::NormalQuick ||
                 $quality == Quality::NormalCardkey ||
                 $quality == Quality::SlowSixNormal ||
-                $quality == Quality::NormalQuickCardkey
+                $quality == Quality::NormalQuickCardkey ||
+                $quality == Quality::QuickCardkey
             ) {
             }
             elseif ($quality >= Quality::LowestQuality && $quality <= Quality::HighestQuality) {

helper/refill/policy/quaility.php

@@ -27,7 +27,8 @@ class Quality
     const NormalQuick = 14;
     const SlowSixNormal = 15;
     const NormalCardkey = 16;
-    const NormalQuickCardkey = 17;
+    const NormalQuickCardkey = 17; //1->2->3
+    const QuickCardkey = 18; //2 -> 3
 
     const OilWithoutSN = 1;
     const OilQuick = 2;

helper/refill/policy/xyz/quality_ploy.php

@@ -27,6 +27,7 @@ class quality_ploy extends Quality
             self::SlowSixNormal => ['retry_times' => 65, 'retry_timeout' => 22500, 'per_secs' => 21600],
             self::NormalCardkey => ['retry_times' => 65, 'retry_timeout' => 120, 'per_secs' => 120],
             self::NormalQuickCardkey => ['retry_times' => 65, 'retry_timeout' => 120, 'per_secs' => 120],
+            self::QuickCardkey => ['retry_times' => 65, 'retry_timeout' => 120, 'per_secs' => 120],
 
             self::OilSN_NONE_HAS => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 120],
             self::OilSN_HAS_NONE => ['retry_times' => 65, 'retry_timeout' => 1800, 'per_secs' => 120],
@@ -59,6 +60,7 @@ class quality_ploy extends Quality
             self::SlowSixNormal => [self::SlowSix, self::Normal],
             self::NormalCardkey => [self::Normal, self::CardKey],
             self::NormalQuickCardkey => [self::Normal, self::Quick, self::CardKey],
+            self::QuickCardkey => [self::Quick, self::CardKey],
 
             self::OilSN_NONE_HAS => [self::OilWithoutSN, self::OilWithSN],
             self::OilSN_HAS_NONE => [self::OilWithSN, self::OilWithoutSN],