Merge branch 'ralbex' into rtest

admin/templates/default/merchant.edit.php

@@ -66,12 +66,14 @@
                     <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'] == 2){ echo 'checked';}?> value="2" 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'] == 26){ echo 'checked';}?> value="26" type="radio">无流水+有流水+卡密+快充
                 </td>
             </tr>
             <tr>

admin/templates/default/provider.amount.control.php

@@ -96,6 +96,7 @@
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=common" class="classA" data-type="1-common"><span>无流水油卡单量控制</span></a></li>
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=slow" class="classA" data-type="1-slow"><span>有流水油卡单量控制</span></a></li>
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=card" class="classA" data-type="1-card"><span>卡密油卡单量控制</span></a></li>
+                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=fast" class="classA" data-type="1-fast"><span>快充油卡单量控制</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/provider.group.php

@@ -128,6 +128,14 @@
                             <?php }?>
                             卡密油卡通道
                         </p>
+                        <p data-quality="2" data-type="1">
+                            <?php if(in_array('2-1',$output['check'])){?>
+                                <i class="layui-icon layui-icon-rate-solid"></i>
+                            <?php }else{?>
+                                <i class="layui-icon layui-icon-rate"></i>
+                            <?php }?>
+                            快充油卡通道
+                        </p>
                     </div>
                     <div class="inblock" style="flex:1">
                         <table class="tb-type2">

admin/templates/default/provider.index.php

@@ -28,6 +28,7 @@
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=common"><span>无流水油卡单量控制</span></a></li>
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=slow"><span>有流水油卡单量控制</span></a></li>
                 <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=card"><span>卡密油卡单量控制</span></a></li>
+                <li><a href="index.php?act=merchant&op=provider_amount_control&type=1&form=fast"><span>快充油卡单量控制</span></a></li>
             </ul>
         </div>
     </div>

data/config/win/refill.ini.php

@@ -192,16 +192,28 @@ $fetch_lingzh_oil = ['name' => 'fetch_lingzh', 'store_id' => 96, 'qualitys' => '
     ],
     'period' => [], 'refill_type' => 'fetch'];
 
-$xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '3',
+$xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '2',
     'amount' => [
         50 => [
-            ['goods_id' => 6965, 'price' => 49.9, 'quality' => 3, 'card_type' => 'sinopec'],
-            ['goods_id' => 6965, 'price' => 50.25, 'quality' => 3, 'card_type' => 'petrochina']
+            ['goods_id' => 6965, 'price' => 49.9, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6965, 'price' => 50.25, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        100 => [
+            ['goods_id' => 6966, 'price' => 101, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6966, 'price' => 100.5, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        200 => [
+            ['goods_id' => 6967, 'price' => 202, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6967, 'price' => 201, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        500 => [
+            ['goods_id' => 6968, 'price' => 503, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6968, 'price' => 502.5, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        1000 => [
+            ['goods_id' => 6969, 'price' => 1006, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6969, 'price' => 1005, 'quality' => 2, 'card_type' => 'petrochina']
         ],
-        100 => [['goods_id' => 6966, 'price' => 100.5, 'quality' => 3, 'card_type' => 'petrochina']],
-        200 => [['goods_id' => 6967, 'price' => 201, 'quality' => 3, 'card_type' => 'petrochina']],
-        500 => [['goods_id' => 6968, 'price' => 502.5, 'quality' => 3, 'card_type' => 'petrochina']],
-        1000 => [['goods_id' => 6969, 'price' => 1005, 'quality' => 3, 'card_type' => 'petrochina']],
     ],
     'period' => [], 'refill_type' => 'api'];
 

data/config/xyz/refill.ini.php

@@ -192,16 +192,28 @@ $fetch_lingzh_oil = ['name' => 'fetch_lingzh', 'store_id' => 96, 'qualitys' => '
     ],
     'period' => [], 'refill_type' => 'fetch'];
 
-$xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '3',
+$xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '2',
     'amount' => [
         50 => [
-            ['goods_id' => 6965, 'price' => 49.9, 'quality' => 3, 'card_type' => 'sinopec'],
-            ['goods_id' => 6965, 'price' => 50.25, 'quality' => 3, 'card_type' => 'petrochina']
+            ['goods_id' => 6965, 'price' => 49.9, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6965, 'price' => 50.25, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        100 => [
+            ['goods_id' => 6966, 'price' => 101, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6966, 'price' => 100.5, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        200 => [
+            ['goods_id' => 6967, 'price' => 202, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6967, 'price' => 201, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        500 => [
+            ['goods_id' => 6968, 'price' => 503, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6968, 'price' => 502.5, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        1000 => [
+            ['goods_id' => 6969, 'price' => 1006, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6969, 'price' => 1005, 'quality' => 2, 'card_type' => 'petrochina']
         ],
-        100 => [['goods_id' => 6966, 'price' => 100.5, 'quality' => 3, 'card_type' => 'petrochina']],
-        200 => [['goods_id' => 6967, 'price' => 201, 'quality' => 3, 'card_type' => 'petrochina']],
-        500 => [['goods_id' => 6968, 'price' => 502.5, 'quality' => 3, 'card_type' => 'petrochina']],
-        1000 => [['goods_id' => 6969, 'price' => 1005, 'quality' => 3, 'card_type' => 'petrochina']],
     ],
     'period' => [], 'refill_type' => 'api'];
 

data/config/xyzadm/refill.ini.php

@@ -192,16 +192,28 @@ $fetch_lingzh_oil = ['name' => 'fetch_lingzh', 'store_id' => 96, 'qualitys' => '
     ],
     'period' => [], 'refill_type' => 'fetch'];
 
-$xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '3',
+$xunyinoil_oil = ['name' => 'xunyinoil', 'store_id' => 109,'qualitys' => '2',
     'amount' => [
         50 => [
-            ['goods_id' => 6965, 'price' => 49.9, 'quality' => 3, 'card_type' => 'sinopec'],
-            ['goods_id' => 6965, 'price' => 50.25, 'quality' => 3, 'card_type' => 'petrochina']
+            ['goods_id' => 6965, 'price' => 49.9, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6965, 'price' => 50.25, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        100 => [
+            ['goods_id' => 6966, 'price' => 101, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6966, 'price' => 100.5, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        200 => [
+            ['goods_id' => 6967, 'price' => 202, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6967, 'price' => 201, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        500 => [
+            ['goods_id' => 6968, 'price' => 503, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6968, 'price' => 502.5, 'quality' => 2, 'card_type' => 'petrochina']
+        ],
+        1000 => [
+            ['goods_id' => 6969, 'price' => 1006, 'quality' => 2, 'card_type' => 'sinopec'],
+            ['goods_id' => 6969, 'price' => 1005, 'quality' => 2, 'card_type' => 'petrochina']
         ],
-        100 => [['goods_id' => 6966, 'price' => 100.5, 'quality' => 3, 'card_type' => 'petrochina']],
-        200 => [['goods_id' => 6967, 'price' => 201, 'quality' => 3, 'card_type' => 'petrochina']],
-        500 => [['goods_id' => 6968, 'price' => 502.5, 'quality' => 3, 'card_type' => 'petrochina']],
-        1000 => [['goods_id' => 6969, 'price' => 1005, 'quality' => 3, 'card_type' => 'petrochina']],
     ],
     'period' => [], 'refill_type' => 'api'];
 

helper/refill/policy/chctl.php

@@ -13,6 +13,7 @@ class chctl
 
     static $cache_names = [
         ['quality'=> 1,'name' => 'channel-ctl-oil-common-limit'],
+        ['quality'=> 2,'name' => 'channel-ctl-oil-fast-limit'],
         ['quality'=> 3,'name' => 'channel-ctl-oil-card-limit'],
         ['quality'=> 5,'name' => 'channel-ctl-oil-slow-limit'],
 

helper/refill/policy/mchoilctl.php

@@ -27,7 +27,7 @@ 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::OilQuick || $quality == Quality::OilCardKey || $quality == Quality::OilWithSN) {
 
             } elseif ($quality == Quality::OilSN_NONE_HAS || $quality == Quality::OilSN_HAS_NONE) {
 

helper/refill/policy/quaility.php

@@ -26,6 +26,7 @@ class Quality
     const SlowSixNormal = 15;
 
     const OilWithoutSN = 1;
+    const OilQuick = 2;
     const OilCardKey   = 3;
     const OilWithSN    = 5;