From 2f326ec891188cb3c313ba7f6d477ca7047287a8 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Sun, 24 Apr 2022 23:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E7=94=B5=E8=AF=9D=E5=8F=B7=E8=8E=B7=E5=8F=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/service/sms/impl/SmsServiceImpl.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java b/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java
index 5fc4afef..8ffff170 100644
--- a/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java
+++ b/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java
@@ -181,20 +181,26 @@ public class SmsServiceImpl extends DefaultBaseService implements ISmsService {
 
     /**
      * 发送短信
+     * 如果用户设置手机号，并且手机号格式正确，用手机号发送，如果格式错误，判断用户名
+     * 如果用户名格式为手机号，用用户名发送，否则不发送短信
      *
      * @param userDTOs
      */
     private void sendSms(List<UserDTO> userDTOs, SmsSendBaseVO smsSendBaseVO) {
         userDTOs.forEach(userDTO -> {
-            if (StringUtils.isBlank(userDTO.getUserPhone())) {
-                LOG.info("用户 {}:{} 手机号为空", userDTO.getUserId(), userDTO.getUserUsername());
+            if (!StringUtils.isBlank(userDTO.getUserPhone())) {
+                if (RegexUtil.isPhone(userDTO.getUserPhone())) {
+                    LOG.info("用户：{}:{} 使用手机号发送短信", userDTO.getUserId(), userDTO.getUserUsername());
+                    sendContentByUserIdAndPhoneAndUserName(userDTO.getUserId(), userDTO.getUserPhone(), userDTO.getUserName(), smsSendBaseVO.getContent());
+                    return;
+                }
+            }
+            if (RegexUtil.isPhone(userDTO.getUserUsername())) {
+                LOG.info("用户：{}:{} 使用用户名发送短信", userDTO.getUserId(), userDTO.getUserUsername());
+                sendContentByUserIdAndPhoneAndUserName(userDTO.getUserId(), userDTO.getUserUsername(), userDTO.getUserName(), smsSendBaseVO.getContent());
                 return;
             }
-            if (!RegexUtil.isPhone(userDTO.getUserPhone())) {
-                LOG.info("用户 {}:{} 手机号格式错误", userDTO.getUserId(), userDTO.getUserUsername());
-                return;
-            }
-            sendContentByUserIdAndPhoneAndUserName(userDTO.getUserId(), userDTO.getUserPhone(), userDTO.getUserName(), smsSendBaseVO.getContent());
+            LOG.info("用户：{}:{} 手机号、用户名均不是手机号", userDTO.getUserId(), userDTO.getUserUsername());
         });
     }