From 8f7acca8e61710640de22c53232bd723fed0cffe Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Sat, 2 Mar 2024 15:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/zhengjie/utils/PhoneUtil.java     | 20 +++++++++++++++++++
 .../impl/TbPlussShopStaffServiceImpl.java     |  5 +++++
 2 files changed, 25 insertions(+)
 create mode 100644 eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java
new file mode 100644
index 00000000..5f79199a
--- /dev/null
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/PhoneUtil.java
@@ -0,0 +1,20 @@
+package me.zhengjie.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+/**
+ * @author lyf
+ */
+public class PhoneUtil {
+    public static boolean validator(String phone) {
+        String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
+        if (phone.length() != 11) {
+            return false;
+        } else {
+            Pattern p = Pattern.compile(regex);
+            Matcher m = p.matcher(phone);
+            return m.matches();
+        }
+    }
+
+}
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java
index 6501b214..42394e87 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/shopStaff/service/impl/TbPlussShopStaffServiceImpl.java
@@ -15,6 +15,7 @@
 */
 package me.zhengjie.modules.shopInfo.shopStaff.service.impl;
 
+import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.shopInfo.shopStaff.domain.TbPlussShopStaff;
 import me.zhengjie.utils.*;
 import lombok.RequiredArgsConstructor;
@@ -71,6 +72,9 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TbPlussShopStaffDto create(TbPlussShopStaff resources) {
+        if (!PhoneUtil.validator(resources.getAccount())){
+            throw new BadRequestException("手机号格式有误");
+        }
         resources.setPassword(MD5Utils.md5("123456"));
         resources.setCreatedAt(Instant.now().toEpochMilli());
         resources.setUpdatedAt(Instant.now().toEpochMilli());
@@ -81,6 +85,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
     @Transactional(rollbackFor = Exception.class)
     public void update(TbPlussShopStaff resources) {
         TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new);
+        resources.setUpdatedAt(tbPlussShopStaff.getUpdatedAt());
         ValidationUtil.isNull( tbPlussShopStaff.getId(),"TbPlussShopStaff","id",resources.getId());
         tbPlussShopStaff.copy(resources);
         tbPlussShopStaffRepository.save(tbPlussShopStaff);