From d66f5a0b5bbb6f2b539f8ea643209f151d069b84 Mon Sep 17 00:00:00 2001
From: elf <360197197@qq.com>
Date: Tue, 15 Nov 2022 22:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PaymentMerchantController.class.php |  2 ++
 Application/Admin/View/PaymentMerchant/form.html   | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/PaymentMerchantController.class.php b/Application/Admin/Controller/PaymentMerchantController.class.php
index ebb8baa29..7a546696b 100644
--- a/Application/Admin/Controller/PaymentMerchantController.class.php
+++ b/Application/Admin/Controller/PaymentMerchantController.class.php
@@ -181,6 +181,7 @@ class PaymentMerchantController extends ThinkController
         $config = I('config', []);
         $ways = I('ways', []);
         $mainId = I('main_id', 0);
+        $isMaster = I('is_master', 0);
 
         if ($name == '') {
             $this->ajaxReturn([
@@ -230,6 +231,7 @@ class PaymentMerchantController extends ThinkController
         $data['update_time'] = time();
         $data['main_name'] = $mainName;
         $data['main_id'] = $mainId;
+        $data['is_master'] = $isMaster;
         if ($id == 0) {
             $data['create_time'] = time();
             $data['channel'] = $channel;
diff --git a/Application/Admin/View/PaymentMerchant/form.html b/Application/Admin/View/PaymentMerchant/form.html
index 07f05a191..b821e4c91 100644
--- a/Application/Admin/View/PaymentMerchant/form.html
+++ b/Application/Admin/View/PaymentMerchant/form.html
@@ -115,8 +115,8 @@
               <td class="l noticeinfo"><i class="mustmark">*</i>启用状态</td>
               <td class="r table_radio">
                 <span class="form_radio">
-                    <label><input type="radio" name="status" value="0"> 禁用</label>
-                    <label><input type="radio" name="status" value="1" checked="checked"> 启用</label>
+                    <label><input type="radio" name="status" value="0" <?php if($record && $record['status'] == 0):?>checked<?php endif;?>> 禁用</label>
+                    <label><input type="radio" name="status" value="1" <?php if(empty($record) || $record['status'] == 1):?>checked<?php endif;?>> 启用</label>
                 </span>
                 <span class="notice-text"></span>
               </td>
@@ -133,6 +133,16 @@
                 <span class="notice-text"></span>
               </td>
             </tr>
+            <tr>
+              <td class="l noticeinfo"><i class="mustmark">*</i>是否公户</td>
+              <td class="r table_radio">
+                <span class="form_radio">
+                    <label><input type="radio" name="is_master" value="0" <?php if(empty($record) || $record['is_master'] == 0):?>checked<?php endif;?>> 否</label>
+                    <label><input type="radio" name="is_master" value="1" <?php if($record && $record['is_master'] == 1):?>checked<?php endif;?>> 是</label>
+                </span>
+                <span class="notice-text"></span>
+              </td>
+            </tr>
             </tbody>
           </table>
           <div id="merchant-detail" style="margin-top: 10px;">