From 94933c40381f855423c07e72222953a4233f850a Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Sun, 30 Apr 2023 23:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=A3=E6=99=BA=E8=BF=9E?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/PaymentMerchant/form.html      | 60 +++++++++++++++++++
 .../Service/PaymentMerchantService.class.php  |  1 +
 2 files changed, 61 insertions(+)

diff --git a/Application/Admin/View/PaymentMerchant/form.html b/Application/Admin/View/PaymentMerchant/form.html
index f2cdc5345..0fc36b1ac 100644
--- a/Application/Admin/View/PaymentMerchant/form.html
+++ b/Application/Admin/View/PaymentMerchant/form.html
@@ -618,6 +618,66 @@
       </table>
     </div>
     <?php endif;?>
+    <?php if(!$record || $record['channel'] == 8):?>
+    <div id="merchant-8">
+      <table border="0" cellspacing="0" cellpadding="0">
+        <tbody>
+        <tr>
+          <td class="l noticeinfo">商户号</td>
+          <td class="r table_radio">
+            <input name="config[mchNo]" type="text" value="<?=$config['mchNo'] ?? ''?>" class="">
+            <span class="notice-text"></span>
+          </td>
+        </tr>
+        <tr>
+          <td class="l noticeinfo">趣智连密钥</td>
+          <td class="r table_radio">
+            <input name="config[secret]" type="text" value="<?=$config['secret'] ?? ''?>" 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 4e1f83bd0..0c4a308eb 100644
--- a/Application/Base/Service/PaymentMerchantService.class.php
+++ b/Application/Base/Service/PaymentMerchantService.class.php
@@ -25,6 +25,7 @@ class PaymentMerchantService {
         5 => '汇付宝支付',
         6 => '酷点支付',
         7 => '丰付支付',
+        8 => '趣智连支付',
     ];
 
     public static $ways = [