From 08ff02ddd49ac9ebf064366e48962e345f8b134f Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 26 Dec 2024 13:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B1=87=E4=BB=98=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validate/shop/LocalStoreValidate.php      | 10 +--
 app/admin/view/shop/local_store/add.html      | 45 +++++++------
 app/admin/view/shop/local_store/edit.html     | 67 ++++++++++---------
 ..._add_hf_id_fields_to_local_store_table.php | 44 ++++++++++++
 4 files changed, 112 insertions(+), 54 deletions(-)
 create mode 100644 database/migrations/20241226054927_add_hf_id_fields_to_local_store_table.php

diff --git a/app/admin/validate/shop/LocalStoreValidate.php b/app/admin/validate/shop/LocalStoreValidate.php
index b26b0c7b..960407b5 100755
--- a/app/admin/validate/shop/LocalStoreValidate.php
+++ b/app/admin/validate/shop/LocalStoreValidate.php
@@ -15,7 +15,7 @@ class LocalStoreValidate extends Validate
         'bankCard' => 'require',
 //        'businessLicense' => 'require',
 //        'crftNo1' => 'require',
-        'selfPhoto' => 'require',
+//        'selfPhoto' => 'require',
 //        'idFront' => 'require',
 //        'idBack' => 'require',
         'name' => 'require',
@@ -33,7 +33,7 @@ class LocalStoreValidate extends Validate
         'bankCard.require' => '银行卡号不能为空',
 //        'businessLicense.require' => '营业执照不能为空',
 //        'crftNo1.require' => '社会信用代码不能为空',
-        'selfPhoto.require' => '自拍照不能为空',
+//        'selfPhoto.require' => '自拍照不能为空',
 //        'idFront.require' => '身份证正面不能为空',
 //        'idBack.require' => '身份证背面不能为空',
         'name.require' => '商户联系人不能为空',
@@ -45,9 +45,9 @@ class LocalStoreValidate extends Validate
 
     protected function checkBankType($value, $rule, $data)
     {
-        if ($value == 1 && empty($data['largeNumber'])) {
-            return '大额卡号不能为空';
-        }
+//        if ($value == 1 && empty($data['largeNumber'])) {
+//            return '大额卡号不能为空';
+//        }
 
         if ($value == 2 && empty($data['bank_user_name'])) {
             return '户名不能为空';
diff --git a/app/admin/view/shop/local_store/add.html b/app/admin/view/shop/local_store/add.html
index 9de1138c..1870d472 100755
--- a/app/admin/view/shop/local_store/add.html
+++ b/app/admin/view/shop/local_store/add.html
@@ -40,14 +40,6 @@
                         </div>
                     </div>
 
-                    <div id="largeNumberBlock" class="layui-form-item">
-                        <label class="layui-form-label"><span style="color:red;">*</span>大额行号：</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="largeNumber" id="largeNumber" lay-verType="tips" lay-verify="crftNo1"
-                                   switch-tab="0" autocomplete="off" class="layui-input">
-                        </div>
-                    </div>
-
                     <div id="bank_user_name_block" class="layui-form-item">
                         <label class="layui-form-label"><span style="color:red;">*</span> 户名：</label>
                         <div class="layui-input-inline">
@@ -83,6 +75,14 @@
                         </div>
                     </div>
 
+                    <div id="largeNumberBlock" class="layui-form-item">
+                        <label class="layui-form-label">大额行号：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="largeNumber" id="largeNumber" lay-verType="tips" lay-verify="crftNo1"
+                                switch-tab="0" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+
                     <div class="layui-form-item">
                         <label for="crftNo1" class="layui-form-label">营业执照有效期开始日期(无营业执照可不填)：</label>
                         <div class="layui-input-inline">
@@ -118,6 +118,13 @@
                         </div>
                         <div class="layui-form-mid layui-word-aux">数字越大越靠前</div>
                     </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">汇付编号：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="hf_id" id="hf_id" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
                 </div>
             </div>
 
@@ -125,17 +132,6 @@
                 <h2 class="layui-colla-title">文件上传</h2>
 
                 <div class="layui-colla-content layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label"><span style="color:red;">*</span>自拍照：</label>
-                        <div class="layui-input-block">
-                            <div class="like-upload-image">
-                                <div class="upload-image-elem"><a id="self-photo" class="add-upload-video" data-type="self_photo"> + 添加图片</a></div>
-                                <input type="hidden" name="selfPhoto">
-                            </div>
-                            <div class="layui-form-mid layui-word-aux">建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片</div>
-                        </div>
-                    </div>
-
                     <div class="layui-form-item">
                         <label class="layui-form-label"><span style="color:red;">*</span>身份证正面：</label>
                         <div class="layui-input-block">
@@ -158,6 +154,17 @@
                         </div>
                     </div>
 
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">自拍照：</label>
+                        <div class="layui-input-block">
+                            <div class="like-upload-image">
+                                <div class="upload-image-elem"><a id="self-photo" class="add-upload-video" data-type="self_photo"> + 添加图片</a></div>
+                                <input type="hidden" name="selfPhoto">
+                            </div>
+                            <div class="layui-form-mid layui-word-aux">建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片</div>
+                        </div>
+                    </div>
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">商家Logo：</label>
                         <div class="layui-input-block">
diff --git a/app/admin/view/shop/local_store/edit.html b/app/admin/view/shop/local_store/edit.html
index 451252e3..1d9ea746 100755
--- a/app/admin/view/shop/local_store/edit.html
+++ b/app/admin/view/shop/local_store/edit.html
@@ -60,14 +60,6 @@
                         </div>
                     </div>
 
-                    <div id="largeNumberBlock" class="layui-form-item" {if condition="$data.bankType eq 2" } style="display: none" {/if}>
-                        <label class="layui-form-label"><span style="color:red;">*</span>大额行号：</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="largeNumber" id="largeNumber" autocomplete="off" class="layui-input"
-                                   value="{$data.largeNumber}">
-                        </div>
-                    </div>
-
                     <div id="bank_user_name_block" class="layui-form-item" {if condition="$data.bankType eq 1" } style="display: none" {/if}>
                         <label class="layui-form-label"><span style="color:red;">*</span> 户名：</label>
                         <div class="layui-input-inline">
@@ -79,7 +71,7 @@
                         <label class="layui-form-label"><span style="color:red;">*</span>银行名称：</label>
                         <div class="layui-input-inline">
                             <input type="text" name="bankName" id="bankName" autocomplete="off" class="layui-input"
-                                   value="{$data.bankName}">
+                                value="{$data.bankName}">
                         </div>
                     </div>
 
@@ -87,7 +79,15 @@
                         <label class="layui-form-label"><span style="color:red;">*</span>银行卡号：</label>
                         <div class="layui-input-inline">
                             <input type="text" name="bankCard" id="bankCard" autocomplete="off" class="layui-input"
-                                   value="{$data.bankCard}">
+                                value="{$data.bankCard}">
+                        </div>
+                    </div>
+
+                    <div id="largeNumberBlock" class="layui-form-item" {if condition="$data.bankType eq 2" } style="display: none" {/if}>
+                        <label class="layui-form-label">大额行号：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="largeNumber" id="largeNumber" autocomplete="off" class="layui-input"
+                                value="{$data.largeNumber}">
                         </div>
                     </div>
 
@@ -95,7 +95,7 @@
                         <label for="crftNo1" class="layui-form-label">社会信用代码：</label>
                         <div class="layui-input-inline">
                             <input type="text" name="crftNo1" id="crftNo1" autocomplete="off" class="layui-input"
-                                   value="{$data.crftNo1}">
+                                value="{$data.crftNo1}">
                         </div>
                     </div>
 
@@ -149,31 +149,19 @@
                             <input type="text" id="notes" autocomplete="off" class="layui-input" value="{$data.notes}" readonly>
                         </div>
                     </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">汇付编号：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="hf_id" id="hf_id" autocomplete="off" value="{$data.hf_id}" class="layui-input">
+                        </div>
+                    </div>
                 </div>
             </div>
 
             <div class="layui-colla-item">
                 <h2 class="layui-colla-title">文件上传</h2>
                 <div class="layui-colla-content layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label"><span style="color:red;">*</span>自拍照：</label>
-                        <div class="layui-input-block">
-                            {if $data.selfPhoto}
-                            <div class="upload-image-div">
-                                <img src="{$data.selfPhoto}" alt="img" class="image-show">
-                                <input type="hidden" name="selfPhoto" value="{$data.selfPhoto}">
-                                <div class="del-upload-btn">x</div>
-                            </div>
-                            {/if}
-                            <div class="like-upload-image">
-                                <div class="upload-image-elem"><a id="self-photo" class="add-upload-video" data-type="self_photo"> +
-                                    添加图片</a></div>
-                                <input type="hidden" name="selfPhoto" {if $data.selfPhoto} value="{$data.selfPhoto}" {/if}>
-                            </div>
-                            <div class="layui-form-mid layui-word-aux">建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片</div>
-                        </div>
-                    </div>
-
                     <div class="layui-form-item">
                         <label class="layui-form-label"><span style="color:red;">*</span>身份证正面：</label>
                         <div class="layui-input-block">
@@ -212,6 +200,25 @@
                         </div>
                     </div>
 
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">自拍照：</label>
+                        <div class="layui-input-block">
+                            {if $data.selfPhoto}
+                            <div class="upload-image-div">
+                                <img src="{$data.selfPhoto}" alt="img" class="image-show">
+                                <input type="hidden" name="selfPhoto" value="{$data.selfPhoto}">
+                                <div class="del-upload-btn">x</div>
+                            </div>
+                            {/if}
+                            <div class="like-upload-image">
+                                <div class="upload-image-elem"><a id="self-photo" class="add-upload-video" data-type="self_photo"> +
+                                    添加图片</a></div>
+                                <input type="hidden" name="selfPhoto" {if $data.selfPhoto} value="{$data.selfPhoto}" {/if}>
+                            </div>
+                            <div class="layui-form-mid layui-word-aux">建议尺寸：宽200像素*高200像素的jpg，jpeg，png图片</div>
+                        </div>
+                    </div>
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">商家Logo：</label>
                         <div class="layui-input-block">
diff --git a/database/migrations/20241226054927_add_hf_id_fields_to_local_store_table.php b/database/migrations/20241226054927_add_hf_id_fields_to_local_store_table.php
new file mode 100644
index 00000000..ef608c9e
--- /dev/null
+++ b/database/migrations/20241226054927_add_hf_id_fields_to_local_store_table.php
@@ -0,0 +1,44 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class AddHfIdFieldsToLocalStoreTable extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table = $this->table('local_store');
+        $table->addColumn('hf_id', 'string', [
+            'limit' => 255, 'default' => '', 'null' => false, 'comment' => '汇付编号'
+        ])->update();  // 更新表结构
+    }
+
+    public function down()
+    {
+        // 回滚操作删除添加的字段
+        $table = $this->table('local_store');
+        $table->removeColumn('hf_id')
+            ->update();
+    }
+}