From b7ee0055f78f7baa428ab7d749731afb851c878a Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Sun, 1 Jun 2025 18:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20bug=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=85=A5=E9=A9=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ShopMchEntryServiceImpl.java | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
index 3c25245d..8cc91495 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
@@ -297,27 +297,31 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
         // 检查企业、法人或个人的营业执照或身份证
         if (ObjectUtil.isNotEmpty(record.getEntity_type()) && record.getEntity_type().equals(2)) {
             // 个人
-            if (StrUtil.isBlank(record.getIndividual_id_number()) || StrUtil.isBlank(record.getIndividual_id_images()) || StrUtil.isBlank(record.getIndividual_id_images2())) {
-                return CommonResult.failed("缺少个人身份证信息！");
-            }
+//            if (StrUtil.isBlank(record.getIndividual_id_number()) || StrUtil.isBlank(record.getIndividual_id_images()) || StrUtil.isBlank(record.getIndividual_id_images2())) {
+//                return CommonResult.failed("缺少个人身份证信息！");
+//            }
 
             if (StrUtil.isNotBlank(record.getIndividual_id_number()) && !StringUtils.validateIDCard(record.getIndividual_id_number())) {
                 return CommonResult.failed("个人身份证号码有误！");
             }
 
+            if (StrUtil.isNotBlank(record.getIndividual_id_number()) && !PhoneNumberUtils.checkPhoneNumber(record.getIndividual_id_number())) {
+                return CommonResult.failed("个人手机号码有误！");
+            }
+
         } else {
             // 企业
-            if (StrUtil.isBlank(record.getBiz_license_number()) || StrUtil.isBlank(record.getBiz_license_image())) {
-                return CommonResult.failed("缺少企业营业执照信息！");
-            }
-
-            if (!StringUtils.verifyBusinessLicense(record.getBiz_license_number())) {
+//            if (StrUtil.isBlank(record.getBiz_license_number()) || StrUtil.isBlank(record.getBiz_license_image())) {
+//                return CommonResult.failed("缺少企业营业执照信息！");
+//            }
+//
+            if (StrUtil.isNotBlank(record.getBiz_license_number()) && !StringUtils.verifyBusinessLicense(record.getBiz_license_number())) {
                 return CommonResult.failed("营业执照号码有误！");
             }
-
-            if (StrUtil.isBlank(record.getLegal_person_id_images()) || StrUtil.isBlank(record.getLegal_person_id_images2())) {
-                return CommonResult.failed("法人身份证信息！");
-            }
+//
+//            if (StrUtil.isBlank(record.getLegal_person_id_images()) || StrUtil.isBlank(record.getLegal_person_id_images2())) {
+//                return CommonResult.failed("法人身份证信息！");
+//            }
 
             if (StrUtil.isNotBlank(record.getLegal_person_id_number()) && !StringUtils.validateIDCard(record.getLegal_person_id_number())) {
                 return CommonResult.failed("法人身份证号码有误！");
@@ -329,17 +333,15 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
         }
 
         // 检查银行账号
-        if (StrUtil.isBlank(record.getBank_name()) || StrUtil.isBlank(record.getAccount_number()) || StrUtil.isBlank(record.getAccount_holder_name())) {
-            return CommonResult.failed("缺少银行账号信息！");
-        }
+//        if (StrUtil.isBlank(record.getBank_name()) || StrUtil.isBlank(record.getAccount_number()) || StrUtil.isBlank(record.getAccount_holder_name())) {
+//            return CommonResult.failed("缺少银行账号信息！");
+//        }
 
         if (StrUtil.isNotBlank(record.getAccount_number()) && !BankUtil.isValidZHBankAccount(record.getAccount_number())) {
             return CommonResult.failed("银行卡号格式有误！");
         }
 
-        if (StrUtil.isBlank(record.getOpenning_bank_code())) {
-            return CommonResult.failed("请填写结算账户开户⾏号！");
-        } else {
+        if (StrUtil.isNotBlank(record.getOpenning_bank_code())) {
             // 对公对私，结算账户清算⾏号和结算账户开户⾏号一定一致
             record.setClearing_bank_code(record.getOpenning_bank_code());
         }