diff --git a/Application/Admin/View/PaymentMerchant/form.html b/Application/Admin/View/PaymentMerchant/form.html
index 3989e8a6c..f2cdc5345 100644
--- a/Application/Admin/View/PaymentMerchant/form.html
+++ b/Application/Admin/View/PaymentMerchant/form.html
@@ -496,6 +496,128 @@
       </table>
     </div>
     <?php endif;?>
+
+    <?php if(!$record || $record['channel'] == 6):?>
+    <div id="merchant-6">
+      <table border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td class="l noticeinfo">商户号</td>
+          <td class="r table_radio">
+            <input name="config[mch_id]" type="text" value="<?=$config['mch_id'] ?? ''?>" class="">
+            <span class="notice-text"></span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">酷点密钥</td>
+          <td class="r table_radio">
+            <input name="config[secret_key]" type="text" value="<?=$config['secret_key'] ?? ''?>" class="">
+            <span class="notice-text">酷点密钥</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">支付方式:</td>
+          <td class="r table_radio">
+            <span class="form_checkbox">
+              <label>
+                <input name="ways[]" type="checkbox" value="1" class="" <?php if($record && in_array(1, $ways)):?>checked<?php endif;?>>
+              </label>
+            </span>
+            <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">支付宝</span>
+            <span class="form_checkbox">
+              <label>
+                <input name="ways[]" type="checkbox" value="2" class="" <?php if($record && in_array(2, $ways)):?>checked<?php endif;?>>
+              </label>
+            </span>
+            <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">微信</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">日支付限量</td>
+          <td class="r table_radio">
+            <input name="config[day_pay_limit]" type="text" value="<?=$config['day_pay_limit'] ?? ''?>" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+            <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">月支付限量</td>
+          <td class="r table_radio">
+            <input name="config[month_pay_limit]" type="text" value="<?=$config['month_pay_limit'] ?? ''?>" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+            <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">渠道费率</td>
+          <td class="r">
+            <input name="config[channel_rate]" type="text" value="<?=$config['channel_rate'] ?? ''?>" class="" placeholder="设置支付渠道的的费用比例">
+            <span class="notice-text">%</span>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+    <?php endif;?>
+
+    <?php if(!$record || $record['channel'] == 7):?>
+    <div id="merchant-7">
+      <table border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td class="l noticeinfo">商户号</td>
+          <td class="r table_radio">
+            <input name="config[merchantCode]" type="text" value="<?=$config['merchantCode'] ?? ''?>" class="">
+            <span class="notice-text"></span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">丰付密钥</td>
+          <td class="r table_radio">
+            <input name="config[secretKey]" type="text" value="<?=$config['secretKey'] ?? ''?>" class="">
+            <span class="notice-text">丰付密钥秘钥</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">支付方式:</td>
+          <td class="r table_radio">
+            <span class="form_checkbox">
+              <label>
+                <input name="ways[]" type="checkbox" value="1" class="" <?php if($record && in_array(1, $ways)):?>checked<?php endif;?>>
+              </label>
+            </span>
+            <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">支付宝</span>
+            <span class="form_checkbox">
+              <label>
+                <input name="ways[]" type="checkbox" value="2" class="" <?php if($record && in_array(2, $ways)):?>checked<?php endif;?>>
+              </label>
+            </span>
+            <span class="notice-text" style="margin-left:5px;margin-right: 15px;width: 70px;">微信</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">日支付限量</td>
+          <td class="r table_radio">
+            <input name="config[day_pay_limit]" type="text" value="<?=$config['day_pay_limit'] ?? ''?>" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+            <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">月支付限量</td>
+          <td class="r table_radio">
+            <input name="config[month_pay_limit]" type="text" value="<?=$config['month_pay_limit'] ?? ''?>" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+            <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">渠道费率</td>
+          <td class="r">
+            <input name="config[channel_rate]" type="text" value="<?=$config['channel_rate'] ?? ''?>" class="" placeholder="设置支付渠道的的费用比例">
+            <span class="notice-text">%</span>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+    <?php endif;?>
   </div>
 
 </block>
diff --git a/Application/Base/Service/PaymentMerchantService.class.php b/Application/Base/Service/PaymentMerchantService.class.php
index b23dfbeba..4e1f83bd0 100644
--- a/Application/Base/Service/PaymentMerchantService.class.php
+++ b/Application/Base/Service/PaymentMerchantService.class.php
@@ -23,6 +23,8 @@ class PaymentMerchantService {
         3 => '易宝支付',
         4 => '双乾支付',
         5 => '汇付宝支付',
+        6 => '酷点支付',
+        7 => '丰付支付',
     ];
 
     public static $ways = [